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,844 |
31.01.2022 00:45:32
| -10,800 |
0649dc4fe8658a2a09e8f215e395f1f261e13003
|
Just some fixes in tests and response validator
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/abc.py",
"new_path": "vkbottle/api/abc.py",
"diff": "from abc import ABC, abstractmethod\n-from typing import TYPE_CHECKING, Any, List\n+from typing import TYPE_CHECKING, Any, List, Callable, Awaitable\nfrom vkbottle_types.categories import APICategories\n@@ -10,6 +10,7 @@ if TYPE_CHECKING:\nfrom .request_validator import ABCRequestValidator\nfrom .response_validator import ABCResponseValidator\nfrom .token_generator import ABCTokenGenerator\n+ from vkbottle.exception_factory import CaptchaError\nclass ABCAPI(APICategories, ABC):\n@@ -23,6 +24,7 @@ class ABCAPI(APICategories, ABC):\nrequest_rescheduler: \"ABCRequestRescheduler\"\nresponse_validators: List[\"ABCResponseValidator\"]\nrequest_validators: List[\"ABCRequestValidator\"]\n+ captcha_handler: Callable[[\"CaptchaError\"], Awaitable]\n@abstractmethod\nasync def request(self, method: str, data: dict) -> dict:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -57,7 +57,7 @@ class API(ABCAPI):\nself.request_rescheduler = request_rescheduler or BlockingRequestRescheduler()\nself.response_validators: List[\"ABCResponseValidator\"] = DEFAULT_RESPONSE_VALIDATORS\nself.request_validators: List[\"ABCRequestValidator\"] = DEFAULT_REQUEST_VALIDATORS # type: ignore\n- self.captcha_handler: Optional[CaptchaHandler] = None\n+ self.captcha_handler: Optional[\"CaptchaHandler\"] = None\nasync def request(self, method: str, data: dict) -> dict:\n\"\"\"Makes a single request opening a session\"\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"new_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"diff": "from typing import TYPE_CHECKING, Any, Dict, NoReturn, Type, Union\nfrom vkbottle.exception_factory import CaptchaError, VKAPIError\n+from vkbottle.modules import logger\nfrom .abc import ABCResponseValidator\n@@ -27,34 +28,24 @@ class VKAPIErrorResponseValidator(ABCResponseValidator):\nif \"response\" not in response:\n# invalid response, just igrnore it\nreturn response\n- elif not (\n- (\n- isinstance(response.get(\"response\"), list)\n- and any(item.get(\"error\") for item in response[\"response\"])\n+ elif isinstance(response[\"response\"], list):\n+ errors = [item[\"error\"] for item in response[\"response\"] if \"error\" in item]\n+ if errors:\n+ logger.debug(\n+ f\"{len(errors)} API error(s) in response wasn't handled: {errors}\"\n)\n- ):\n- # response is not a list of errors\nreturn response\nif ctx_api.ignore_errors:\nreturn None\n- if isinstance(response.get(\"response\"), list):\n- # find first error in list\n- error = next(item[\"error\"] for item in response[\"response\"] if item.get(\"error\"))\n- else:\nerror = response[\"error\"]\n- # list of errors has a special error object with description and code instead of error_msg and error_code\n- code = error.pop(\"error_code\") if \"error_code\" in error else error.pop(\"code\")\n- if error.get(\"description\"):\n- error[\"error_msg\"] = error.pop(\"description\")\n- error[\"request_params\"] = [{\"key\": key, \"value\": value} for key, value in data.items()]\n+ code = error.pop(\"error_code\")\nexception = SPECIFIC_ERRORS.get(code, VKAPIError[code])\n- if exception == CaptchaError and getattr(ctx_api, \"captcha_handler\"):\n+ if exception == CaptchaError and ctx_api.captcha_handler:\nkey = await ctx_api.captcha_handler(exception(**error)) # type: ignore\nreturn await ctx_api.request(\n- method,\n- {**data, \"captcha_sid\": error[\"captcha_sid\"], \"captcha_key\": key},\n+ method, {**data, \"captcha_sid\": error[\"captcha_sid\"], \"captcha_key\": key}\n)\nraise exception(**error)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tests/test_bot.py",
"new_path": "vkbottle/tests/test_bot.py",
"diff": "@@ -57,7 +57,14 @@ EXAMPLE_EVENT = {\n\"carousel\": False,\n\"lang_id\": 0,\n},\n- \"message\": {\"id\": 100, \"from_id\": 1},\n+ \"message\": {\n+ \"id\": 100,\n+ \"from_id\": 1,\n+ \"peer_id\": 1,\n+ \"date\": 1,\n+ \"text\": \"test\",\n+ \"out\": 0,\n+ },\n},\n},\n],\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_tools.py",
"new_path": "vkbottle/tools/tests/test_tools.py",
"diff": "@@ -208,9 +208,9 @@ def test_loop_wrapper():\nasync def task3():\npass\n- lw = LoopWrapper(tasks=[task1()])\n- lw.on_startup.append(task2())\n- lw.on_shutdown.append(task3())\n+ lw = LoopWrapper(tasks=[task1]) # type: ignore\n+ lw.on_startup.append(task2) # type: ignore\n+ lw.on_shutdown.append(task3) # type: ignore\nlw.run_forever(MockedLoop()) # type: ignore\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Just some fixes in tests and response validator
|
718,844 |
07.02.2022 01:18:59
| -10,800 |
7c6e44f4e7d051b5289c09074156c967a4be7ebb
|
Change Message.answer return type
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "@@ -19,6 +19,8 @@ from vkbottle.dispatch.dispenser.base import StatePeer\nfrom vkbottle.modules import logger\nif TYPE_CHECKING:\n+ from vkbottle_types.responses.messages import MessagesSendUserIdsResponseItem\n+\nfrom vkbottle.api import ABCAPI, API\nMENTION_PATTERN = re.compile(r\"^\\[(?P<type>club|public|id)(?P<id>\\d*)\\|(?P<text>.+)\\],?\\s?\")\n@@ -158,24 +160,26 @@ class BaseMessageMin(MessagesMessage, ABC):\nintent: Optional[str] = None,\nsubscribe_id: Optional[int] = None,\n**kwargs,\n- ) -> int:\n+ ) -> \"MessagesSendUserIdsResponseItem\":\nlocals().update(kwargs)\ndata = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\n- required_params = (\"peer_id\", \"user_id\", \"domain\", \"chat_id\", \"user_ids\")\n- if any(data.get(param) for param in required_params):\n+ deprecated_params = (\"peer_id\", \"user_id\", \"domain\", \"chat_id\", \"user_ids\")\n+ deprecated = [k for k in data if k in deprecated_params]\n+ if deprecated:\nlogger.warning(\n\"Params like peer_id or user_id is deprecated in Message.answer().\"\n\"Use API.messages.send() instead\"\n)\n- data[\"peer_id\"] = self.peer_id\n+ for k in deprecated:\n+ data.pop(k)\nstream = StringIO(message)\nwhile True:\nmsg = stream.read(4096)\nif msg:\ndata[\"message\"] = msg\n- response = (await self.ctx_api.request(\"messages.send\", data))[\"response\"]\n+ response = (await self.ctx_api.messages.send(peer_ids=[self.peer_id], **data))[0]\nif stream.tell() == len(message or \"\"):\nbreak\nreturn response\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"diff": "@@ -6,6 +6,7 @@ from vkbottle_types.objects import ClientInfoForBots, MessagesForward\nfrom ..base import BaseMessageMin\nif TYPE_CHECKING:\n+ from vkbottle_types.responses.messages import MessagesSendUserIdsResponseItem\nfrom vkbottle.api import ABCAPI\n@@ -25,11 +26,10 @@ class MessageMin(BaseMessageMin):\nmessage: Optional[str] = None,\nattachment: Optional[str] = None,\n**kwargs,\n- ) -> int:\n+ ) -> \"MessagesSendUserIdsResponseItem\":\nlocals().update(kwargs)\ndata = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\n- data[\"peer_id\"] = self.peer_id\ndata[\"forward\"] = MessagesForward(\nconversation_message_ids=[self.conversation_message_id], # type: ignore\npeer_id=self.peer_id,\n@@ -44,7 +44,7 @@ class MessageMin(BaseMessageMin):\nattachment: Optional[str] = None,\nforward_message_ids: Optional[List[int]] = None,\n**kwargs,\n- ) -> int:\n+ ) -> \"MessagesSendUserIdsResponseItem\":\nlocals().update(kwargs)\ndata = {\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"diff": "@@ -8,6 +8,8 @@ from vkbottle.modules import logger\nfrom vkbottle.tools.dev.event_data import OpenAppEvent, OpenLinkEvent, ShowSnackbarEvent\nif TYPE_CHECKING:\n+ from vkbottle_types.responses.messages import MessagesSendUserIdsResponseItem\n+\nfrom vkbottle.api import ABCAPI, API\nEventDataType = Union[ShowSnackbarEvent, OpenAppEvent, OpenLinkEvent]\n@@ -89,23 +91,25 @@ class MessageEventMin(MessageEventObject):\nintent: Optional[str] = None,\nsubscribe_id: Optional[int] = None,\n**kwargs,\n- ) -> int:\n+ ) -> \"MessagesSendUserIdsResponseItem\":\nlocals().update(kwargs)\ndata = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\n- required_params = (\"peer_id\", \"user_id\", \"domain\", \"chat_id\", \"user_ids\")\n- if any(data.get(param) for param in required_params):\n+ deprecated_params = (\"peer_id\", \"user_id\", \"domain\", \"chat_id\", \"user_ids\")\n+ deprecated = [k for k in data if k in deprecated_params]\n+ if deprecated:\nlogger.warning(\n\"Params like peer_id or user_id is deprecated in MessageEvent.send_message().\"\n\"Use API.messages.send() instead\"\n)\n- data[\"peer_id\"] = self.peer_id\n+ for k in deprecated:\n+ data.pop(k)\nstream = StringIO(message)\nwhile True:\nmsg = stream.read(4096)\nif msg:\ndata[\"message\"] = msg\n- response = (await self.ctx_api.request(\"messages.send\", data))[\"response\"]\n+ response = (await self.ctx_api.messages.send(peer_ids=[self.peer_id], **data))[0]\nif stream.tell() == len(message or \"\"):\nbreak\nreturn response\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/user/message.py",
"new_path": "vkbottle/tools/dev/mini_types/user/message.py",
"diff": "@@ -3,6 +3,8 @@ from typing import TYPE_CHECKING, List, Optional\nfrom ..base import BaseMessageMin\nif TYPE_CHECKING:\n+ from vkbottle_types.responses.messages import MessagesSendUserIdsResponseItem\n+\nfrom vkbottle.api import ABCAPI\n@@ -20,11 +22,10 @@ class MessageMin(BaseMessageMin):\nmessage: Optional[str] = None,\nattachment: Optional[str] = None,\n**kwargs,\n- ) -> int:\n+ ) -> \"MessagesSendUserIdsResponseItem\":\nlocals().update(kwargs)\ndata = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\n- data[\"peer_id\"] = self.peer_id\ndata[\"reply_to\"] = self.id\nreturn await self.answer(**data)\n@@ -35,7 +36,7 @@ class MessageMin(BaseMessageMin):\nattachment: Optional[str] = None,\nforward_message_ids: Optional[List[int]] = None,\n**kwargs,\n- ) -> int:\n+ ) -> \"MessagesSendUserIdsResponseItem\":\nlocals().update(kwargs)\ndata = {\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Change Message.answer return type
|
718,865 |
27.03.2022 04:37:37
| 18,000 |
466528de4a52c8d94136d219be639dc3bfdda4d8
|
Changed typing for event parameter
Since user events accept integers as the title, argument "event" should accept either integers or UserEventType not string
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/user.py",
"new_path": "vkbottle/framework/labeler/user.py",
"diff": "@@ -65,7 +65,7 @@ class UserLabeler(BaseLabeler):\ndef raw_event(\nself,\n- event: Union[str, List[str]],\n+ event: Union[int, List[int], UserEventType, List[UserEventType]],\ndataclass: Type[\"BaseUserEvent\"] = RawUserEvent,\n*rules: \"ABCRule\",\nblocking: bool = True,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Changed typing for event parameter (#487)
Since user events accept integers as the title, argument "event" should accept either integers or UserEventType not string
|
718,844 |
27.03.2022 12:55:32
| -10,800 |
0030e3f9c3e1877febe26ee8696d10dfa23e23d6
|
Fix singleton http client init
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.2.1\"\n+version = \"4.2.2\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/aiohttp.py",
"new_path": "vkbottle/http/aiohttp.py",
"diff": "@@ -29,7 +29,7 @@ class AiohttpClient(ABCHTTPClient):\nself.session = session\n- self.__session_params = kwargs\n+ self._session_params = kwargs\nasync def request_raw(\nself, url: str, method: str = \"GET\", data: Optional[dict] = None, **kwargs\n@@ -38,7 +38,7 @@ class AiohttpClient(ABCHTTPClient):\nself.session = ClientSession(\nconnector=TCPConnector(ssl=False),\njson_serialize=self.json_processing_module.dumps,\n- **self.__session_params,\n+ **self._session_params,\n)\nasync with self.session.request(url=url, method=method, data=data, **kwargs) as response:\nawait response.read()\n@@ -81,7 +81,7 @@ class SingleAiohttpClient(AiohttpClient):\ndef __new__(cls, *args, **kwargs):\nif cls.__instance__ is not None:\nreturn cls.__instance__\n- return super().__new__(cls, *args, **kwargs)\n+ return super().__new__(cls)\ndef __aexit__(self, exc_type, exc_val, exc_tb):\npass # no need to close session in this case\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tests/test_http.py",
"new_path": "vkbottle/tests/test_http.py",
"diff": "import pytest\nfrom vkbottle.tools.test_utils import MockedClient\n+from vkbottle.http import SingleAiohttpClient, AiohttpClient\n@pytest.mark.asyncio\n@@ -9,3 +10,11 @@ async def test_client():\ntext = await client.request_text(\"https://example.com\")\nawait client.close()\nassert text == \"some text\"\n+\n+\n+@pytest.mark.asyncio\n+async def test_client_init():\n+ client = AiohttpClient(test=\"test\")\n+ assert client._session_params[\"test\"] == \"test\"\n+ singleton_client = SingleAiohttpClient(test=\"test\")\n+ assert singleton_client._session_params[\"test\"] == \"test\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix singleton http client init
|
718,844 |
27.03.2022 13:20:59
| -10,800 |
9c029f449f0ffa41da1ec6e72b7a42fedea3813d
|
Fix server disconnect error
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/bot_polling.py",
"new_path": "vkbottle/polling/bot_polling.py",
"diff": "from typing import TYPE_CHECKING, AsyncGenerator, Optional\n+from aiohttp.client_exceptions import ServerConnectionError\n+\nfrom vkbottle.exception_factory import ErrorHandler\nfrom vkbottle.modules import logger\n@@ -62,6 +64,8 @@ class BotPolling(ABCPolling):\ncontinue\nserver[\"ts\"] = event[\"ts\"]\nyield event\n+ except ServerConnectionError:\n+ server = await self.get_server()\nexcept BaseException as e:\nawait self.error_handler.handle(e)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/user_polling.py",
"new_path": "vkbottle/polling/user_polling.py",
"diff": "from typing import TYPE_CHECKING, AsyncIterator, Optional\n+from aiohttp.client_exceptions import ServerConnectionError\n+\nfrom vkbottle.exception_factory import ErrorHandler\nfrom vkbottle.modules import logger\n@@ -63,6 +65,8 @@ class UserPolling(ABCPolling):\ncontinue\nserver[\"ts\"] = event[\"ts\"]\nyield event\n+ except ServerConnectionError:\n+ server = await self.get_server()\nexcept BaseException as e:\nawait self.error_handler.handle(e)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix server disconnect error (#486)
|
718,844 |
07.04.2022 20:51:05
| -10,800 |
7b808a80eba2e8ca35a6275263009dfa0f897b4c
|
Added get_attachments and get_full_message shortcuts for Message object
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"diff": "@@ -4,6 +4,7 @@ from vkbottle_types.events.bot_events import MessageNew\nfrom vkbottle_types.objects import ClientInfoForBots, MessagesForward\nfrom ..base import BaseMessageMin\n+from vkbottle.modules import logger\nif TYPE_CHECKING:\nfrom vkbottle_types.responses.messages import MessagesSendUserIdsResponseItem\n@@ -21,6 +22,54 @@ class MessageMin(BaseMessageMin):\nreturn False\nreturn self.mention.id == -self.group_id\n+ async def get_full_message(self) -> \"MessageMin\":\n+ if not self.is_cropped and self.id:\n+ return self\n+ message = (\n+ await self.ctx_api.messages.get_by_conversation_message_id(\n+ peer_id=self.peer_id,\n+ conversation_message_ids=[self.conversation_message_id], # type: ignore\n+ )\n+ ).items[0]\n+ self.is_cropped = False\n+ for k, v in message.__dict__.items():\n+ self.__dict__[k] = v\n+ return self\n+\n+ def get_attachments(self) -> List[str]:\n+ if not self.attachments:\n+ return []\n+ if not self.id and any(\n+ getattr(attachment, attachment.type.value).access_key\n+ for attachment in self.attachments\n+ ):\n+ logger.warning(\n+ (\n+ \"Some attachments may does't work because of wrong access_key. \"\n+ \"Use .get_full_message() to update message and fix this issue.\"\n+ )\n+ )\n+ if self.is_cropped:\n+ logger.warning(\n+ (\n+ \"Some attachments may doesn't included because message is cropped. \"\n+ \"Use .get_full_message() to update message and fix this issue.\"\n+ )\n+ )\n+ attachments = []\n+ for attachment in self.attachments:\n+ attachment_type = attachment.type.value\n+ attachment_object = getattr(attachment, attachment_type)\n+ if not hasattr(attachment_object, \"id\") or not hasattr(attachment_object, \"owner_id\"):\n+ continue\n+ attachment_string = (\n+ f\"{attachment_type}{attachment_object.owner_id}_{attachment_object.id}\"\n+ )\n+ if hasattr(attachment_object, \"access_key\"):\n+ attachment_string += f\"_{attachment_object.access_key}\"\n+ attachments.append(attachment_string)\n+ return attachments\n+\nasync def reply(\nself,\nmessage: Optional[str] = None,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added get_attachments and get_full_message shortcuts for Message object
|
718,844 |
07.04.2022 21:15:20
| -10,800 |
382fb989ad46c34c097984f05c072a158722bdd1
|
Added `raw_event_auto_rules` and some warnings
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/abc.py",
"new_path": "vkbottle/framework/labeler/abc.py",
"diff": "@@ -16,6 +16,7 @@ class ABCLabeler(ABC):\nraw_event_view: \"ABCRawEventView\"\ncustom_rules: Dict[str, Type[\"ABCRule\"]]\nauto_rules: List[\"ABCRule\"]\n+ raw_event_auto_rules: List[\"ABCRule\"]\nrule_config: Dict[str, Any]\n@abstractmethod\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/base.py",
"new_path": "vkbottle/framework/labeler/base.py",
"diff": "@@ -51,12 +51,14 @@ class BaseLabeler(ABCLabeler):\nraw_event_view: \"ABCRawEventView\",\ncustom_rules: Optional[Dict[str, Type[\"ABCRule\"]]] = None,\nauto_rules: Optional[List[\"ABCRule\"]] = None,\n+ raw_event_auto_rules: Optional[List[\"ABCRule\"]] = None,\n):\nself.message_view = message_view\nself.raw_event_view = raw_event_view\nself.custom_rules = custom_rules or DEFAULT_CUSTOM_RULES\nself.auto_rules = auto_rules or []\n+ self.raw_event_auto_rules = raw_event_auto_rules or []\n# Rule config is accessible from every single custom rule\nself.rule_config: Dict[str, Any] = {\n@@ -96,6 +98,11 @@ class BaseLabeler(ABCLabeler):\ndef message(\nself, *rules: \"ABCRule\", blocking: bool = True, **custom_rules\n) -> \"LabeledMessageHandler\":\n+ assert all(isinstance(rule, ABCRule) for rule in rules), (\n+ \"All rules must be subclasses of ABCRule or rule shortcuts \"\n+ \"(https://vkbottle.readthedocs.io/ru/latest/high-level/routing/rules/)\"\n+ )\n+\ndef decorator(func):\nself.message_view.handlers.append(\nFromFuncHandler(\n@@ -113,6 +120,11 @@ class BaseLabeler(ABCLabeler):\ndef chat_message(\nself, *rules: \"ABCRule\", blocking: bool = True, **custom_rules\n) -> \"LabeledMessageHandler\":\n+ assert all(isinstance(rule, ABCRule) for rule in rules), (\n+ \"All rules must be subclasses of ABCRule or rule shortcuts \"\n+ \"(https://vkbottle.readthedocs.io/ru/latest/high-level/routing/rules/)\"\n+ )\n+\ndef decorator(func):\nself.message_view.handlers.append(\nFromFuncHandler(\n@@ -131,6 +143,11 @@ class BaseLabeler(ABCLabeler):\ndef private_message(\nself, *rules: \"ABCRule\", blocking: bool = True, **custom_rules\n) -> \"LabeledMessageHandler\":\n+ assert all(isinstance(rule, ABCRule) for rule in rules), (\n+ \"All rules must be subclasses of ABCRule or rule shortcuts \"\n+ \"(https://vkbottle.readthedocs.io/ru/latest/high-level/routing/rules/)\"\n+ )\n+\ndef decorator(func):\nself.message_view.handlers.append(\nFromFuncHandler(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/bot.py",
"new_path": "vkbottle/framework/labeler/bot.py",
"diff": "@@ -37,6 +37,7 @@ class BotLabeler(BaseLabeler):\nraw_event_view: Optional[RawBotEventView] = None,\ncustom_rules: Optional[Dict[str, Type[\"ABCRule\"]]] = None,\nauto_rules: Optional[List[\"ABCRule\"]] = None,\n+ raw_event_auto_rules: Optional[List[\"ABCRule\"]] = None,\n):\nmessage_view = message_view or BotMessageView()\nraw_event_view = raw_event_view or RawBotEventView()\n@@ -45,6 +46,7 @@ class BotLabeler(BaseLabeler):\nraw_event_view=raw_event_view,\ncustom_rules=custom_rules,\nauto_rules=auto_rules,\n+ raw_event_auto_rules=raw_event_auto_rules,\n)\ndef message(\n@@ -70,6 +72,10 @@ class BotLabeler(BaseLabeler):\nblocking: bool = True,\n**custom_rules,\n) -> \"LabeledHandler\":\n+ assert all(isinstance(rule, ABCRule) for rule in rules), (\n+ \"All rules must be subclasses of ABCRule or rule shortcuts \"\n+ \"(https://vkbottle.readthedocs.io/ru/latest/high-level/routing/rules/)\"\n+ )\nif not isinstance(event, list):\nevent = [event]\n@@ -83,7 +89,7 @@ class BotLabeler(BaseLabeler):\nFromFuncHandler(\nfunc,\n*rules,\n- *self.auto_rules,\n+ *self.raw_event_auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n),\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/user.py",
"new_path": "vkbottle/framework/labeler/user.py",
"diff": "@@ -38,6 +38,7 @@ class UserLabeler(BaseLabeler):\nraw_event_view: Optional[RawUserEventView] = None,\ncustom_rules: Optional[Dict[str, Type[\"ABCRule\"]]] = None,\nauto_rules: Optional[List[\"ABCRule\"]] = None,\n+ raw_event_auto_rules: Optional[List[\"ABCRule\"]] = None,\n):\nmessage_view = message_view or UserMessageView()\nraw_event_view = raw_event_view or RawUserEventView()\n@@ -46,6 +47,7 @@ class UserLabeler(BaseLabeler):\nraw_event_view=raw_event_view,\ncustom_rules=custom_rules,\nauto_rules=auto_rules,\n+ raw_event_auto_rules=raw_event_auto_rules,\n)\ndef message(\n@@ -71,6 +73,10 @@ class UserLabeler(BaseLabeler):\nblocking: bool = True,\n**custom_rules,\n) -> \"LabeledHandler\":\n+ assert all(isinstance(rule, ABCRule) for rule in rules), (\n+ \"All rules must be subclasses of ABCRule or rule shortcuts \"\n+ \"(https://vkbottle.readthedocs.io/ru/latest/high-level/routing/rules/)\"\n+ )\nif not isinstance(event, list):\nevent = [event]\n@@ -84,7 +90,7 @@ class UserLabeler(BaseLabeler):\nFromFuncHandler(\nfunc,\n*rules,\n- *self.auto_rules,\n+ *self.raw_event_auto_rules,\n*self.get_custom_rules(custom_rules),\nblocking=blocking,\n),\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added `raw_event_auto_rules` and some warnings
|
718,844 |
07.04.2022 21:22:47
| -10,800 |
22ce8afda1568608a5b7e5f8cc826e06f5b99b10
|
Quite a few changes in the logic of PayloadMapRule
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -344,11 +344,13 @@ class PayloadMapRule(ABCRule[BaseMessageMin]):\nreturn False\nreturn True\n- async def check(self, event: BaseMessageMin) -> bool:\n+ async def check(self, event: BaseMessageMin) -> Union[dict, bool]:\npayload = event.get_payload_json()\nif not isinstance(payload, dict):\nreturn False\n- return await self.match(payload, self.payload_map)\n+ if await self.match(payload, self.payload_map):\n+ return payload\n+ return False\nclass FromUserRule(ABCRule[BaseMessageMin]):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Quite a few changes in the logic of PayloadMapRule
|
718,844 |
08.04.2022 22:46:30
| -10,800 |
e559524593af90a3acfdcc1991226426acddd552
|
Added ForeignMessageMin for replies and forwarded messages.
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc/message.py",
"new_path": "vkbottle/dispatch/views/abc/message.py",
"diff": "@@ -22,6 +22,7 @@ class ABCMessageView(ABCDispenseView[T_contra, F_contra], ABC, Generic[T_contra,\nhandlers: List[\"ABCHandler\"]\nstate_source_key: str\ndefault_text_approximators: List[Callable[[\"BaseMessageMin\"], str]]\n+ replace_mention = True\ndef __init__(self):\nsuper().__init__()\n@@ -35,7 +36,7 @@ class ABCMessageView(ABCDispenseView[T_contra, F_contra], ABC, Generic[T_contra,\n@staticmethod\n@abstractmethod\n- async def get_message(event: T_contra, ctx_api) -> Any:\n+ async def get_message(event: T_contra, ctx_api, replace_mention: bool) -> Any:\npass\nasync def handle_event(\n@@ -45,7 +46,7 @@ class ABCMessageView(ABCDispenseView[T_contra, F_contra], ABC, Generic[T_contra,\n# https://dev.vk.com/api/user-long-poll/getting-started\nlogger.debug(\"Handling event ({}) with message view\".format(self.get_event_type(event)))\ncontext_variables: dict = {}\n- message = await self.get_message(event, ctx_api)\n+ message = await self.get_message(event, ctx_api, self.replace_mention)\nmessage.state_peer = await state_dispenser.cast(self.get_state_key(message))\nfor text_ax in self.default_text_approximators:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -24,8 +24,8 @@ class ABCBotMessageView(ABCMessageView[dict, T_contra], ABC, Generic[T_contra]):\nreturn event[\"type\"]\n@staticmethod\n- async def get_message(event, ctx_api) -> \"MessageMin\":\n- return message_min(event, ctx_api)\n+ async def get_message(event, ctx_api, replace_mention: bool) -> \"MessageMin\":\n+ return message_min(event, ctx_api, replace_mention)\nasync def process_event(self, event: dict) -> bool:\nreturn GroupEventType(self.get_event_type(event)) == GroupEventType.MESSAGE_NEW\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/message.py",
"new_path": "vkbottle/dispatch/views/user/message.py",
"diff": "@@ -24,8 +24,8 @@ class ABCUserMessageView(ABCMessageView[list, T_contra], ABC, Generic[T_contra])\nreturn event[0]\n@staticmethod\n- async def get_message(event: list, ctx_api) -> \"MessageMin\":\n- return await message_min(event[1], ctx_api)\n+ async def get_message(event: list, ctx_api, replace_mention: bool) -> \"MessageMin\":\n+ return await message_min(event[1], ctx_api, replace_mention)\nasync def process_event(self, event: list) -> bool:\nif not (self.handlers or self.middlewares):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/modules.py",
"new_path": "vkbottle/modules.py",
"diff": "@@ -11,6 +11,12 @@ class JSONModule(Protocol):\ndef dumps(self, o: dict) -> str:\n...\n+ def load(self, f: str) -> dict:\n+ ...\n+\n+ def dump(self, o: dict, f: str) -> None:\n+ ...\n+\njson: JSONModule = choice_in_order(\n[\"ujson\", \"hyperjson\", \"orjson\"], do_import=True, default=\"json\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"diff": "+from abc import ABC, abstractmethod\n+from typing import TYPE_CHECKING, Any, Callable, List, Optional, Union\n+\n+from pydantic import root_validator\n+from vkbottle_types.objects import (\n+ AudioAudio,\n+ DocsDoc,\n+ MessagesForeignMessage,\n+ PhotosPhoto,\n+ UsersUserFull,\n+ VideoVideo,\n+ WallWallComment,\n+ WallWallpostFull,\n+)\n+\n+from vkbottle.modules import json\n+\n+if TYPE_CHECKING:\n+ from vkbottle.api import ABCAPI, API\n+\n+from .mention import Mention, replace_mention_validator\n+\n+\n+class BaseForeignMessageMin(MessagesForeignMessage, ABC):\n+ unprepared_ctx_api: Optional[Any] = None\n+ replace_mention: Optional[bool] = None\n+ _mention: Optional[Mention] = None\n+\n+ __replace_mention = root_validator(replace_mention_validator, allow_reuse=True, pre=False) # type: ignore\n+\n+ @property\n+ def ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\n+ return getattr(self, \"unprepared_ctx_api\")\n+\n+ @property\n+ def mention(self) -> Optional[Mention]:\n+ \"\"\"Returns `Mention` object if message contains mention,\n+ eg if message is `@username text` returns `Mention(id=123, text=\"text\")`,\n+ also mention is automatically removes from message text\"\"\"\n+ return self._mention\n+\n+ @property\n+ @abstractmethod\n+ def is_mentioned(self) -> bool:\n+ \"\"\"Returns True if current bot is mentioned in message\"\"\"\n+ pass\n+\n+ async def get_user(self, raw_mode: bool = False, **kwargs) -> Union[UsersUserFull, dict]:\n+ raw_user = (await self.ctx_api.request(\"users.get\", {\"user_ids\": self.from_id, **kwargs}))[\n+ \"response\"\n+ ][0]\n+ return raw_user if raw_mode else UsersUserFull(**raw_user)\n+\n+ @property\n+ def chat_id(self) -> Optional[int]:\n+ return None if self.peer_id is None else self.peer_id - 2_000_000_000\n+\n+ @property\n+ def message_id(self) -> Optional[int]:\n+ return self.conversation_message_id or self.id\n+\n+ def get_attachments(self) -> Optional[List[str]]:\n+ if self.attachments is None:\n+ return None\n+ attachments = []\n+ for attachment in self.attachments:\n+ attachment_type = attachment.type.value\n+ attachment_object = getattr(attachment, attachment_type)\n+ if not hasattr(attachment_object, \"id\") or not hasattr(attachment_object, \"owner_id\"):\n+ continue\n+ attachment_string = (\n+ f\"{attachment_type}{attachment_object.owner_id}_{attachment_object.id}\"\n+ )\n+ if attachment_object.access_key:\n+ attachment_string += f\"_{attachment_object.access_key}\"\n+ attachments.append(attachment_string)\n+ return attachments\n+\n+ def get_wall_attachment(self) -> Optional[List[\"WallWallpostFull\"]]:\n+ if self.attachments is None:\n+ return None\n+ result = [attachment.wall for attachment in self.attachments if attachment.wall]\n+ return result or None\n+\n+ def get_wall_reply_attachment(self) -> Optional[List[\"WallWallComment\"]]:\n+ if self.attachments is None:\n+ return None\n+ result = [\n+ attachment.wall_reply for attachment in self.attachments if attachment.wall_reply\n+ ]\n+ return result or None\n+\n+ def get_photo_attachments(self) -> Optional[List[\"PhotosPhoto\"]]:\n+ if self.attachments is None:\n+ return None\n+ return [attachment.photo for attachment in self.attachments if attachment.photo]\n+\n+ def get_video_attachments(self) -> Optional[List[\"VideoVideo\"]]:\n+ if self.attachments is None:\n+ return None\n+ return [attachment.video for attachment in self.attachments if attachment.video]\n+\n+ def get_doc_attachments(self) -> Optional[List[\"DocsDoc\"]]:\n+ if self.attachments is None:\n+ return None\n+ return [attachment.doc for attachment in self.attachments if attachment.doc]\n+\n+ def get_audio_attachments(self) -> Optional[List[\"AudioAudio\"]]:\n+ if self.attachments is None:\n+ return None\n+ return [attachment.audio for attachment in self.attachments if attachment.audio]\n+\n+ def get_message_id(self) -> Optional[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: Callable[[str], Union[dict, str]] = lambda payload: payload,\n+ ) -> Optional[Union[dict, str]]:\n+ if self.payload is None:\n+ return None\n+ try:\n+ return json.loads(self.payload)\n+ except (ValueError, TypeError) as e:\n+ if throw_error:\n+ raise e from e\n+ return unpack_failure(self.payload)\n+\n+\n+BaseForeignMessageMin.update_forward_refs()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev/mini_types/base/mention.py",
"diff": "+from pydantic import BaseModel\n+import re\n+\n+MENTION_PATTERN = re.compile(r\"^\\[(?P<type>club|public|id)(?P<id>\\d*)\\|(?P<text>.+)\\],?\\s?\")\n+\n+\n+class Mention(BaseModel):\n+ \"\"\"Mention object\n+\n+ :param id: Identifier of the user that was mentioned (negative if it's a group)\n+ :param text: Mention text\n+ \"\"\"\n+\n+ id: int\n+ text: str\n+\n+\n+def replace_mention_validator(cls, values):\n+ if not values.get(\"replace_mention\"):\n+ return values\n+ message_text = values.get(\"text\")\n+ if not message_text:\n+ return values\n+ match = MENTION_PATTERN.search(message_text)\n+ if not match:\n+ return values\n+ values[\"text\"] = message_text.replace(match.group(0), \"\", 1)\n+ mention_id = int(match.group(\"id\"))\n+ if match.group(\"type\") in (\"club\", \"public\"):\n+ mention_id = -mention_id\n+ values[\"_mention\"] = Mention(id=mention_id, text=match.group(\"text\"))\n+ return values\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "-import re\nfrom abc import ABC, abstractmethod\nfrom io import StringIO\nfrom typing import TYPE_CHECKING, Any, Callable, List, Optional, Union\n-from pydantic import BaseModel, root_validator\n+from pydantic import root_validator\nfrom vkbottle_types.objects import (\nAudioAudio,\nDocsDoc,\n@@ -16,46 +15,27 @@ from vkbottle_types.objects import (\n)\nfrom vkbottle.dispatch.dispenser.base import StatePeer\n-from vkbottle.modules import logger\n+from vkbottle.modules import json, logger\n+from vkbottle_types.objects import MessagesForward\nif TYPE_CHECKING:\nfrom vkbottle_types.responses.messages import MessagesSendUserIdsResponseItem\nfrom vkbottle.api import ABCAPI, API\n-MENTION_PATTERN = re.compile(r\"^\\[(?P<type>club|public|id)(?P<id>\\d*)\\|(?P<text>.+)\\],?\\s?\")\n-\n-\n-class Mention(BaseModel):\n- \"\"\"Mention object\n-\n- :param id: Identifier of the user that was mentioned (negative if it's a group)\n- :param text: Mention text\n- \"\"\"\n-\n- id: int\n- text: str\n+from .mention import Mention, replace_mention_validator\n+from .foreign_message import BaseForeignMessageMin\nclass BaseMessageMin(MessagesMessage, ABC):\nunprepared_ctx_api: Optional[Any] = None\nstate_peer: Optional[\"StatePeer\"] = None\n+ reply_message: Optional[\"BaseForeignMessageMin\"] = None\n+ fwd_messages: Optional[List[\"BaseForeignMessageMin\"]] = []\n+ replace_mention: Optional[bool] = None\n_mention: Optional[Mention] = None\n- @root_validator\n- def __replace_mention(cls, values):\n- message_text = values.get(\"text\")\n- if not message_text:\n- return values\n- match = MENTION_PATTERN.search(message_text)\n- if not match:\n- return values\n- values[\"text\"] = message_text.replace(match.group(0), \"\", 1)\n- mention_id = int(match.group(\"id\"))\n- if match.group(\"type\") in (\"club\", \"public\"):\n- mention_id = -mention_id\n- values[\"_mention\"] = Mention(id=mention_id, text=match.group(\"text\"))\n- return values\n+ __replace_mention = root_validator(replace_mention_validator, allow_reuse=True, pre=False) # type: ignore\n@property\ndef ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\n@@ -88,6 +68,23 @@ class BaseMessageMin(MessagesMessage, ABC):\ndef message_id(self) -> int:\nreturn self.conversation_message_id or self.id\n+ def get_attachments(self) -> Optional[List[str]]:\n+ if self.attachments is None:\n+ return None\n+ attachments = []\n+ for attachment in self.attachments:\n+ attachment_type = attachment.type.value\n+ attachment_object = getattr(attachment, attachment_type)\n+ if not hasattr(attachment_object, \"id\") or not hasattr(attachment_object, \"owner_id\"):\n+ continue\n+ attachment_string = (\n+ f\"{attachment_type}{attachment_object.owner_id}_{attachment_object.id}\"\n+ )\n+ if attachment_object.access_key:\n+ attachment_string += f\"_{attachment_object.access_key}\"\n+ attachments.append(attachment_string)\n+ return attachments\n+\ndef get_wall_attachment(self) -> Optional[List[\"WallWallpostFull\"]]:\nif self.attachments is None:\nreturn None\n@@ -129,15 +126,14 @@ class BaseMessageMin(MessagesMessage, ABC):\nself,\nthrow_error: bool = False,\nunpack_failure: Callable[[str], Union[dict, str]] = lambda payload: payload,\n- json: Any = __import__(\"json\"),\n) -> Optional[Union[dict, str]]:\nif self.payload is None:\nreturn None\ntry:\nreturn json.loads(self.payload)\n- except (json.decoder.JSONDecodeError, TypeError) as e:\n+ except (ValueError, TypeError) as e:\nif throw_error:\n- raise e\n+ raise e from e\nreturn unpack_failure(self.payload)\nasync def answer(\n@@ -173,16 +169,53 @@ class BaseMessageMin(MessagesMessage, ABC):\n)\nfor k in deprecated:\ndata.pop(k)\n-\n+ if not isinstance(message, str):\n+ message = str(message)\nstream = StringIO(message)\nwhile True:\nmsg = stream.read(4096)\nif msg:\ndata[\"message\"] = msg\n- response = (await self.ctx_api.messages.send(peer_ids=[self.peer_id], **data))[0]\n+ response = (await self.ctx_api.messages.send(peer_ids=[self.peer_id], **data))[0] # type: ignore\nif stream.tell() == len(message or \"\"):\nbreak\nreturn response\n+ async def reply(\n+ self,\n+ message: Optional[str] = None,\n+ attachment: Optional[str] = None,\n+ **kwargs,\n+ ) -> \"MessagesSendUserIdsResponseItem\":\n+ locals().update(kwargs)\n+\n+ data = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\n+ data[\"forward\"] = MessagesForward(\n+ conversation_message_ids=[self.conversation_message_id], # type: ignore\n+ peer_id=self.peer_id,\n+ is_reply=True,\n+ ).json()\n+\n+ return await self.answer(**data)\n+\n+ async def forward(\n+ self,\n+ message: Optional[str] = None,\n+ attachment: Optional[str] = None,\n+ **kwargs,\n+ ) -> \"MessagesSendUserIdsResponseItem\":\n+ locals().update(kwargs)\n+\n+ data = {\n+ k: v\n+ for k, v in locals().items()\n+ if k not in (\"self\", \"kwargs\", \"forward_message_ids\") and v is not None\n+ }\n+ data[\"forward\"] = MessagesForward(\n+ conversation_message_ids=[self.conversation_message_id], peer_id=self.peer_id # type: ignore\n+ ).json()\n+\n+ return await self.answer(**data)\n+\nBaseMessageMin.update_forward_refs()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev/mini_types/bot/foreign_message.py",
"diff": "+from typing import Optional, List\n+\n+from vkbottle_types.objects import ClientInfoForBots\n+\n+from ..base.foreign_message import BaseForeignMessageMin\n+from pydantic import root_validator\n+\n+\n+class ForeignMessageMin(BaseForeignMessageMin):\n+ group_id: Optional[int] = None\n+ client_info: Optional[\"ClientInfoForBots\"] = None\n+ reply_message: Optional[\"ForeignMessageMin\"] = None\n+ fwd_messages: Optional[List[\"ForeignMessageMin\"]] = []\n+\n+ @root_validator\n+ def __foreign_messages(cls, values):\n+ foreign_messages = []\n+ if values.get(\"fwd_messages\"):\n+ foreign_messages.extend(values[\"fwd_messages\"])\n+ if values.get(\"reply_message\"):\n+ foreign_messages.append(values[\"reply_message\"])\n+ for foreign_message in foreign_messages:\n+ foreign_message.unprepared_ctx_api = values[\"unprepared_ctx_api\"]\n+ foreign_message.replace_mention = values[\"replace_mention\"]\n+ foreign_message.group_id = values[\"group_id\"]\n+ foreign_message.client_info = values[\"client_info\"]\n+ return values\n+\n+ @property\n+ def is_mentioned(self) -> bool:\n+ if not (self.mention and self.group_id):\n+ return False\n+ return self.mention.id == -self.group_id\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"diff": "from typing import TYPE_CHECKING, List, Optional\n+from pydantic import root_validator\nfrom vkbottle_types.events.bot_events import MessageNew\n-from vkbottle_types.objects import ClientInfoForBots, MessagesForward\n+from vkbottle_types.objects import ClientInfoForBots\nfrom ..base import BaseMessageMin\n-from vkbottle.modules import logger\n+from .foreign_message import ForeignMessageMin\nif TYPE_CHECKING:\n- from vkbottle_types.responses.messages import MessagesSendUserIdsResponseItem\n-\nfrom vkbottle.api import ABCAPI\n+from vkbottle.modules import logger\n+\nclass MessageMin(BaseMessageMin):\ngroup_id: Optional[int] = None\nclient_info: Optional[\"ClientInfoForBots\"] = None\n+ reply_message: Optional[\"ForeignMessageMin\"] = None\n+ fwd_messages: Optional[List[\"ForeignMessageMin\"]] = []\n+ _is_full: Optional[bool] = None\n+\n+ @root_validator(pre=True)\n+ def __foreign_messages(cls, values):\n+ foreign_messages = []\n+ if values.get(\"fwd_messages\"):\n+ foreign_messages.extend(values[\"fwd_messages\"])\n+ if values.get(\"reply_message\"):\n+ foreign_messages.append(values[\"reply_message\"])\n+ for foreign_message in foreign_messages:\n+ foreign_message[\"unprepared_ctx_api\"] = values[\"unprepared_ctx_api\"]\n+ foreign_message[\"replace_mention\"] = values[\"replace_mention\"]\n+ foreign_message[\"group_id\"] = values[\"group_id\"]\n+ foreign_message[\"client_info\"] = values[\"client_info\"]\n+ return values\n@property\ndef is_mentioned(self) -> bool:\n@@ -22,8 +40,8 @@ class MessageMin(BaseMessageMin):\nreturn False\nreturn self.mention.id == -self.group_id\n- async def get_full_message(self) -> \"MessageMin\":\n- if self.is_cropped is None and self.id:\n+ async def get_full_message(self) -> \"BaseMessageMin\":\n+ if self._is_full:\nreturn self\nmessage = (\nawait self.ctx_api.messages.get_by_conversation_message_id(\n@@ -33,16 +51,21 @@ class MessageMin(BaseMessageMin):\n).items[0]\nif self.is_cropped:\nmessage.is_cropped = False\n- for k, v in message.__dict__.items():\n- self.__dict__[k] = v\n+ self.__dict__.update(message.__dict__)\n+ super().__init__(**self.dict())\n+ self.__dict__[\"_is_full\"] = True\nreturn self\n- def get_attachments(self) -> List[str]:\n- if not self.attachments:\n- return []\n- if not self.id and any(\n+ def get_attachments(self) -> Optional[List[str]]:\n+ if self.attachments is None:\n+ return None\n+ if (\n+ not self.id\n+ and not self._is_full\n+ and any(\ngetattr(attachment, attachment.type.value).access_key\nfor attachment in self.attachments\n+ )\n):\nlogger.warning(\n(\n@@ -57,70 +80,19 @@ class MessageMin(BaseMessageMin):\n\"Use .get_full_message() to update message and fix this issue.\"\n)\n)\n- attachments = []\n- for attachment in self.attachments:\n- attachment_type = attachment.type.value\n- attachment_object = getattr(attachment, attachment_type)\n- if not hasattr(attachment_object, \"id\") or not hasattr(attachment_object, \"owner_id\"):\n- continue\n- attachment_string = (\n- f\"{attachment_type}{attachment_object.owner_id}_{attachment_object.id}\"\n- )\n- if hasattr(attachment_object, \"access_key\"):\n- attachment_string += f\"_{attachment_object.access_key}\"\n- attachments.append(attachment_string)\n- return attachments\n-\n- async def reply(\n- self,\n- message: Optional[str] = None,\n- attachment: Optional[str] = None,\n- **kwargs,\n- ) -> \"MessagesSendUserIdsResponseItem\":\n- locals().update(kwargs)\n-\n- data = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\n- data[\"forward\"] = MessagesForward(\n- conversation_message_ids=[self.conversation_message_id], # type: ignore\n- peer_id=self.peer_id,\n- is_reply=True,\n- ).json()\n-\n- return await self.answer(**data)\n-\n- async def forward(\n- self,\n- message: Optional[str] = None,\n- attachment: Optional[str] = None,\n- forward_message_ids: Optional[List[int]] = None,\n- **kwargs,\n- ) -> \"MessagesSendUserIdsResponseItem\":\n- locals().update(kwargs)\n-\n- data = {\n- k: v\n- for k, v in locals().items()\n- if k not in (\"self\", \"kwargs\", \"forward_message_ids\") and v is not None\n- }\n- if not forward_message_ids:\n- forward_message_ids = [self.conversation_message_id] # type: ignore\n- data[\"forward\"] = MessagesForward(\n- conversation_message_ids=forward_message_ids, peer_id=self.peer_id\n- ).json()\n-\n- return await self.answer(**data)\n+ return super().get_attachments()\n-def message_min(event: dict, ctx_api: \"ABCAPI\") -> \"MessageMin\":\n+def message_min(event: dict, ctx_api: \"ABCAPI\", replace_mention: bool = True) -> \"MessageMin\":\nupdate = MessageNew(**event)\nif update.object.message is None:\nraise RuntimeError(\"Please set longpoll to latest version\")\n- message = MessageMin(\n+ return MessageMin(\n**update.object.message.dict(),\nclient_info=update.object.client_info,\ngroup_id=update.group_id,\n+ replace_mention=replace_mention,\n+ unprepared_ctx_api=ctx_api,\n)\n- setattr(message, \"unprepared_ctx_api\", ctx_api)\n- return message\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev/mini_types/user/foreign_message.py",
"diff": "+from typing import Optional, List\n+\n+from ..base.foreign_message import BaseForeignMessageMin\n+from pydantic import root_validator\n+\n+\n+class ForeignMessageMin(BaseForeignMessageMin):\n+ user_id: Optional[int] = None\n+ reply_message: Optional[\"ForeignMessageMin\"] = None\n+ fwd_messages: Optional[List[\"ForeignMessageMin\"]] = []\n+\n+ @root_validator\n+ def __foreign_messages(cls, values):\n+ foreign_messages = []\n+ if values.get(\"fwd_messages\"):\n+ foreign_messages.extend(values[\"fwd_messages\"])\n+ if values.get(\"reply_message\"):\n+ foreign_messages.append(values[\"reply_message\"])\n+ for foreign_message in foreign_messages:\n+ foreign_message.unprepared_ctx_api = values[\"unprepared_ctx_api\"]\n+ foreign_message.replace_mention = values[\"replace_mention\"]\n+ foreign_message.user_id = values[\"user_id\"]\n+ return values\n+\n+ @property\n+ def is_mentioned(self) -> bool:\n+ if not (self.mention and self.user_id):\n+ return False\n+ return self.mention.id == self.user_id\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/user/message.py",
"new_path": "vkbottle/tools/dev/mini_types/user/message.py",
"diff": "-from typing import TYPE_CHECKING, List, Optional\n+from typing import TYPE_CHECKING, Optional\nfrom ..base import BaseMessageMin\n+from pydantic import root_validator\nif TYPE_CHECKING:\n- from vkbottle_types.responses.messages import MessagesSendUserIdsResponseItem\nfrom vkbottle.api import ABCAPI\n@@ -13,52 +13,31 @@ class MessageMin(BaseMessageMin):\n@property\ndef is_mentioned(self) -> bool:\n- if not self.mention:\n- return False\n- return self.mention.id == self.user_id\n-\n- async def reply(\n- self,\n- message: Optional[str] = None,\n- attachment: Optional[str] = None,\n- **kwargs,\n- ) -> \"MessagesSendUserIdsResponseItem\":\n- locals().update(kwargs)\n-\n- data = {k: v for k, v in locals().items() if k not in (\"self\", \"kwargs\") and v is not None}\n- data[\"reply_to\"] = self.id\n-\n- return await self.answer(**data)\n-\n- async def forward(\n- self,\n- message: Optional[str] = None,\n- attachment: Optional[str] = None,\n- forward_message_ids: Optional[List[int]] = None,\n- **kwargs,\n- ) -> \"MessagesSendUserIdsResponseItem\":\n- locals().update(kwargs)\n-\n- data = {\n- k: v\n- for k, v in locals().items()\n- if k not in (\"self\", \"kwargs\", \"forward_message_ids\") and v is not None\n- }\n- if not forward_message_ids:\n- forward_message_ids = [self.id]\n-\n- data[\"forward_messages\"] = forward_message_ids\n-\n- return await self.answer(**data)\n+ return False if not self.mention else self.mention.id == self.user_id\n+\n+ @root_validator(pre=True)\n+ def __foreign_messages(cls, values):\n+ foreign_messages = []\n+ if values.get(\"fwd_messages\"):\n+ foreign_messages.extend(values[\"fwd_messages\"])\n+ if values.get(\"reply_message\"):\n+ foreign_messages.append(values[\"reply_message\"])\n+ for foreign_message in foreign_messages:\n+ foreign_message[\"unprepared_ctx_api\"] = values[\"unprepared_ctx_api\"]\n+ foreign_message[\"replace_mention\"] = values[\"replace_mention\"]\n+ foreign_message[\"user_id\"] = values[\"user_id\"]\n+ return values\nMessageMin.update_forward_refs()\n-async def message_min(message_id: int, ctx_api: \"ABCAPI\") -> \"MessageMin\":\n+async def message_min(\n+ message_id: int, ctx_api: \"ABCAPI\", replace_mention: bool = True\n+) -> \"MessageMin\":\nmessage_object = (await ctx_api.request(\"messages.getById\", {\"message_ids\": message_id}))[\n\"response\"\n][\"items\"][0]\n- message = MessageMin(**message_object)\n- setattr(message, \"unprepared_ctx_api\", ctx_api)\n- return message\n+ return MessageMin(\n+ **message_object, unprepared_ctx_api=ctx_api, replace_mention=replace_mention\n+ )\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_tools.py",
"new_path": "vkbottle/tools/tests/test_tools.py",
"diff": "@@ -166,7 +166,7 @@ def test_bp_importer(mocker: MockerFixture):\n)\nfor bp in load_blueprints_from_package(main_package):\n- required_files.pop(required_files.index(str(bp).split(\".\")[-1] + \".py\"))\n+ required_files.pop(required_files.index(f'{str(bp).split(\".\")[-1]}.py'))\nassert not len(required_files)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Added ForeignMessageMin for replies and forwarded messages.
|
718,844 |
09.04.2022 14:16:29
| -10,800 |
ad9d11c6773ecef7f8b489c7f339cea7f187b4e4
|
Rename get_attachments to get_attachment_strings
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"diff": "@@ -59,7 +59,7 @@ class BaseForeignMessageMin(MessagesForeignMessage, ABC):\ndef message_id(self) -> Optional[int]:\nreturn self.conversation_message_id or self.id\n- def get_attachments(self) -> Optional[List[str]]:\n+ def get_attachment_strings(self) -> Optional[List[str]]:\nif self.attachments is None:\nreturn None\nattachments = []\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "from abc import ABC, abstractmethod\nfrom io import StringIO\n-from typing import TYPE_CHECKING, Any, Callable, List, Optional, Union\n+from typing import TYPE_CHECKING, Any, Callable, List, Optional, Union, overload\nfrom pydantic import root_validator\n+from typing_extensions import Literal\nfrom vkbottle_types.objects import (\nAudioAudio,\nDocsDoc,\n@@ -54,6 +55,14 @@ class BaseMessageMin(MessagesMessage, ABC):\n\"\"\"Returns True if current bot is mentioned in message\"\"\"\npass\n+ @overload\n+ async def get_user(self, raw_mode: Literal[False] = ..., **kwargs) -> UsersUserFull:\n+ ...\n+\n+ @overload\n+ async def get_user(self, raw_mode: Literal[True] = ..., **kwargs) -> dict:\n+ ...\n+\nasync def get_user(self, raw_mode: bool = False, **kwargs) -> Union[UsersUserFull, dict]:\nraw_user = (await self.ctx_api.request(\"users.get\", {\"user_ids\": self.from_id, **kwargs}))[\n\"response\"\n@@ -68,7 +77,7 @@ class BaseMessageMin(MessagesMessage, ABC):\ndef message_id(self) -> int:\nreturn self.conversation_message_id or self.id\n- def get_attachments(self) -> Optional[List[str]]:\n+ def get_attachment_strings(self) -> Optional[List[str]]:\nif self.attachments is None:\nreturn None\nattachments = []\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/foreign_message.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/foreign_message.py",
"diff": "@@ -31,3 +31,6 @@ class ForeignMessageMin(BaseForeignMessageMin):\nif not (self.mention and self.group_id):\nreturn False\nreturn self.mention.id == -self.group_id\n+\n+\n+ForeignMessageMin.update_forward_refs()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"diff": "@@ -56,7 +56,7 @@ class MessageMin(BaseMessageMin):\nself.__dict__[\"_is_full\"] = True\nreturn self\n- def get_attachments(self) -> Optional[List[str]]:\n+ def get_attachment_strings(self) -> Optional[List[str]]:\nif self.attachments is None:\nreturn None\nif (\n@@ -80,7 +80,7 @@ class MessageMin(BaseMessageMin):\n\"Use .get_full_message() to update message and fix this issue.\"\n)\n)\n- return super().get_attachments()\n+ return super().get_attachment_strings()\ndef message_min(event: dict, ctx_api: \"ABCAPI\", replace_mention: bool = True) -> \"MessageMin\":\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"diff": "@@ -116,7 +116,7 @@ class MessageEventMin(MessageEvent):\nmsg = stream.read(4096)\nif msg:\ndata[\"message\"] = msg\n- response = (await self.ctx_api.messages.send(peer_ids=[self.peer_id], **data))[0]\n+ response = (await self.ctx_api.messages.send(peer_ids=[self.peer_id], **data))[0] # type: ignore\nif stream.tell() == len(message or \"\"):\nbreak\nreturn response\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/user/foreign_message.py",
"new_path": "vkbottle/tools/dev/mini_types/user/foreign_message.py",
"diff": "@@ -28,3 +28,6 @@ class ForeignMessageMin(BaseForeignMessageMin):\nif not (self.mention and self.user_id):\nreturn False\nreturn self.mention.id == self.user_id\n+\n+\n+ForeignMessageMin.update_forward_refs()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Rename get_attachments to get_attachment_strings
|
718,840 |
10.04.2022 04:16:20
| -10,800 |
a935f1744ed40bb0d48976e729aa0d32ce249749
|
Fix undefined ABCRule
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/base.py",
"new_path": "vkbottle/framework/labeler/base.py",
"diff": "@@ -4,13 +4,12 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Type\nimport vbml\nfrom vkbottle.dispatch.handlers import FromFuncHandler\n-from vkbottle.dispatch.rules import base\n+from vkbottle.dispatch.rules import ABCRule, base\nfrom vkbottle.dispatch.views.abc import ABCRawEventView\nfrom .abc import ABCLabeler\nif TYPE_CHECKING:\n- from vkbottle.dispatch.rules import ABCRule\nfrom vkbottle.dispatch.views import ABCView\nfrom vkbottle.dispatch.views.abc import ABCMessageView\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix undefined ABCRule
|
718,844 |
26.04.2022 22:45:49
| -10,800 |
1552ffaabb5ad4d4c7b1dca1889c60a045634570
|
Some warnings and fixes
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.2.2\"\n+version = \"4.3.0\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc/message.py",
"new_path": "vkbottle/dispatch/views/abc/message.py",
"diff": "@@ -22,7 +22,7 @@ class ABCMessageView(ABCDispenseView[T_contra, F_contra], ABC, Generic[T_contra,\nhandlers: List[\"ABCHandler\"]\nstate_source_key: str\ndefault_text_approximators: List[Callable[[\"BaseMessageMin\"], str]]\n- replace_mention = True\n+ replace_mention = False\ndef __init__(self):\nsuper().__init__()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"diff": "@@ -13,7 +13,7 @@ from vkbottle_types.objects import (\nWallWallpostFull,\n)\n-from vkbottle.modules import json\n+from vkbottle.modules import json, logger\nif TYPE_CHECKING:\nfrom vkbottle.api import ABCAPI, API\n@@ -37,6 +37,11 @@ class BaseForeignMessageMin(MessagesForeignMessage, ABC):\n\"\"\"Returns `Mention` object if message contains mention,\neg if message is `@username text` returns `Mention(id=123, text=\"text\")`,\nalso mention is automatically removes from message text\"\"\"\n+ if not self.replace_mention:\n+ logger.warning(\n+ \"labeler.message_view.replace_mention is set to False, the mention will not be processed\"\n+ )\n+ return None\nreturn self._mention\n@property\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "@@ -47,6 +47,11 @@ class BaseMessageMin(MessagesMessage, ABC):\n\"\"\"Returns `Mention` object if message contains mention,\neg if message is `@username text` returns `Mention(id=123, text=\"text\")`,\nalso mention is automatically removes from message text\"\"\"\n+ if not self.replace_mention:\n+ logger.warning(\n+ \"labeler.message_view.replace_mention is set to False, the mention will not be processed\"\n+ )\n+ return None\nreturn self._mention\n@property\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Some warnings and fixes
|
718,844 |
06.05.2022 09:52:13
| -10,800 |
cddd772bc2c843b2523ad51f80509ec55ab6be1d
|
Change BaseException to Exception in error handler
|
[
{
"change_type": "MODIFY",
"old_path": "docs/low-level/exception_handling/error-handler.md",
"new_path": "docs/low-level/exception_handling/error-handler.md",
"diff": "@@ -24,7 +24,7 @@ async def exc_handler_lookup(e: LookupError):\n```python\n@error_handler.register_undefined_error_handler\n-async def exc_handler_undefined(e: BaseException):\n+async def exc_handler_undefined(e: Exception):\nprint(\"Oh no unknown error occurred\", e)\n```\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/base.py",
"new_path": "vkbottle/dispatch/base.py",
"diff": "@@ -13,14 +13,14 @@ if TYPE_CHECKING:\nclass Router(ABCRouter):\nasync def route(self, event: dict, ctx_api: \"ABCAPI\") -> None:\n- logger.debug(\"Routing update {}\".format(event))\n+ logger.debug(f\"Routing update {event}\")\nfor view in self.views.values():\ntry:\nif not await view.process_event(event):\ncontinue\nawait view.handle_event(event, ctx_api, self.state_dispenser)\n- except BaseException as e:\n+ except Exception as e:\nawait self.error_handler.handle(e)\ndef construct(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/abc.py",
"new_path": "vkbottle/exception_factory/error_handler/abc.py",
"diff": "@@ -5,12 +5,12 @@ AsyncFunc = Callable[..., Awaitable[Any]]\nclass ABCErrorHandler(ABC):\n- error_handlers: Dict[Type[BaseException], AsyncFunc]\n+ error_handlers: Dict[Type[Exception], AsyncFunc]\nundefined_error_handler: Optional[AsyncFunc]\n@abstractmethod\ndef register_error_handler(\n- self, *error_types: Type[BaseException]\n+ self, *error_types: Type[Exception]\n) -> Callable[[AsyncFunc], AsyncFunc]:\npass\n@@ -19,7 +19,7 @@ class ABCErrorHandler(ABC):\npass\n@abstractmethod\n- async def handle(self, error: BaseException) -> Any:\n+ async def handle(self, error: Exception) -> Any:\npass\n@abstractmethod\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/error_handler.py",
"new_path": "vkbottle/exception_factory/error_handler/error_handler.py",
"diff": "@@ -16,7 +16,7 @@ class ErrorHandler(ABCErrorHandler):\nself.undefined_error_handler = None\ndef register_error_handler(\n- self, *error_types: Type[BaseException]\n+ self, *error_types: Type[Exception]\n) -> Callable[[\"AsyncFunc\"], \"AsyncFunc\"]:\ndef decorator(handler: \"AsyncFunc\") -> \"AsyncFunc\":\nfor error_type in error_types:\n@@ -29,12 +29,12 @@ class ErrorHandler(ABCErrorHandler):\nself.undefined_error_handler = handler\nreturn handler\n- def lookup_handler(self, for_type: Type[BaseException]) -> Optional[\"AsyncFunc\"]:\n+ def lookup_handler(self, for_type: Type[Exception]) -> Optional[\"AsyncFunc\"]:\nfor error_type in self.error_handlers:\nif issubclass(for_type, error_type):\nreturn self.error_handlers[error_type]\n- async def handle(self, error: BaseException, *args, **kwargs) -> Any:\n+ async def handle(self, error: Exception, *args, **kwargs) -> Any:\nhandler = self.lookup_handler(type(error)) or self.undefined_error_handler\nif not handler:\n@@ -52,7 +52,7 @@ class ErrorHandler(ABCErrorHandler):\nasync def wrapper(*args, **kwargs) -> Any:\ntry:\nawait func(*args, **kwargs)\n- except BaseException as error:\n+ except Exception as error:\nreturn await self.handle(error, *args, **kwargs)\nreturn wrapper\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/swear_handler/swear_handler.py",
"new_path": "vkbottle/exception_factory/swear_handler/swear_handler.py",
"diff": "@@ -7,7 +7,7 @@ from vkbottle.modules import logger\ndef swear(\nexception: Union[\n- BaseException, Type[BaseException], Tuple[Union[BaseException, Type[BaseException]], ...]\n+ Exception, Type[Exception], Tuple[Union[Exception, Type[Exception]], ...]\n],\nexception_handler: Optional[Callable] = None,\njust_log: bool = False,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/bot_polling.py",
"new_path": "vkbottle/polling/bot_polling.py",
"diff": "@@ -66,7 +66,7 @@ class BotPolling(ABCPolling):\nyield event\nexcept ServerConnectionError:\nserver = await self.get_server()\n- except BaseException as e:\n+ except Exception as e:\nawait self.error_handler.handle(e)\ndef construct(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/user_polling.py",
"new_path": "vkbottle/polling/user_polling.py",
"diff": "@@ -67,7 +67,7 @@ class UserPolling(ABCPolling):\nyield event\nexcept ServerConnectionError:\nserver = await self.get_server()\n- except BaseException as e:\n+ except Exception as e:\nawait self.error_handler.handle(e)\ndef construct(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tests/test_exception_handling.py",
"new_path": "vkbottle/tests/test_exception_handling.py",
"diff": "@@ -18,7 +18,7 @@ def test_code_error():\ndef test_swear_sync():\n- def sync_exception_handler(e: BaseException, a):\n+ def sync_exception_handler(e: Exception, a):\nassert isinstance(e, RuntimeError)\nreturn a\n@@ -45,7 +45,7 @@ async def test_error_handler():\nerror_handler = ErrorHandler()\n@error_handler.register_error_handler(Base)\n- async def handler(error: BaseException) -> int:\n+ async def handler(error: Exception) -> int:\nassert isinstance(error, Derived)\nreturn 42\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tests/test_exception_manager.py",
"new_path": "vkbottle/tests/test_exception_manager.py",
"diff": "@@ -16,7 +16,7 @@ def test_code_exception():\ndef test_swear_sync():\n- def sync_exception_handler(e: BaseException, a):\n+ def sync_exception_handler(e: Exception, a):\nassert isinstance(e, RuntimeError)\nreturn a\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Change BaseException to Exception in error handler
|
718,844 |
06.05.2022 10:03:47
| -10,800 |
cf76f87a8003d71e969f20d8e7772283aa35a433
|
Fix error with ABCRule import
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/swear_handler/swear_handler.py",
"new_path": "vkbottle/exception_factory/swear_handler/swear_handler.py",
"diff": "@@ -6,9 +6,7 @@ from vkbottle.modules import logger\ndef swear(\n- exception: Union[\n- Exception, Type[Exception], Tuple[Union[Exception, Type[Exception]], ...]\n- ],\n+ exception: Union[Exception, Type[Exception], Tuple[Union[Exception, Type[Exception]], ...]],\nexception_handler: Optional[Callable] = None,\njust_log: bool = False,\njust_return: bool = False,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/bot.py",
"new_path": "vkbottle/framework/labeler/bot.py",
"diff": "@@ -3,6 +3,7 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Type, Uni\nfrom vkbottle_types.events import GroupEventType\nfrom vkbottle.dispatch.handlers import FromFuncHandler\n+from vkbottle.dispatch.rules import ABCRule\nfrom vkbottle.dispatch.views.bot import BotHandlerBasement, BotMessageView, RawBotEventView\nfrom .base import BaseLabeler\n@@ -10,7 +11,6 @@ from .base import BaseLabeler\nif TYPE_CHECKING:\nfrom vkbottle_types.events import BaseGroupEvent\n- from vkbottle.dispatch.rules import ABCRule\nfrom vkbottle.dispatch.views.bot import ABCBotMessageView\nfrom vkbottle.tools.dev.mini_types.bot.message import MessageMin\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/user.py",
"new_path": "vkbottle/framework/labeler/user.py",
"diff": "@@ -4,6 +4,7 @@ from vkbottle_types.events.enums import UserEventType\nfrom vkbottle_types.events.user_events import RawUserEvent\nfrom vkbottle.dispatch.handlers import FromFuncHandler\n+from vkbottle.dispatch.rules import ABCRule\nfrom vkbottle.dispatch.views.user import RawUserEventView, UserHandlerBasement, UserMessageView\nfrom .base import BaseLabeler\n@@ -11,7 +12,6 @@ from .base import BaseLabeler\nif TYPE_CHECKING:\nfrom vkbottle_types.events import BaseUserEvent\n- from vkbottle.dispatch.rules import ABCRule\nfrom vkbottle.dispatch.views.user import ABCUserMessageView\nfrom vkbottle.tools.dev.mini_types.user import MessageMin\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix error with ABCRule import
|
718,857 |
06.05.2022 18:27:16
| -18,000 |
69a9c5cc82a76357085ddcba02e2688f2709790d
|
Fix typo in blueprint usage example
|
[
{
"change_type": "MODIFY",
"old_path": "examples/high-level/blueprint.py",
"new_path": "examples/high-level/blueprint.py",
"diff": "@@ -19,7 +19,7 @@ for bp in bps:\nbp.load(bot)\n# Moreover, you can use:\n-# import vkbottle import load_blueprints_from_package\n+# from vkbottle import load_blueprints_from_package\n# for bp in load_blueprints_from_package(\"blueprints\"):\n# bp.load(bot)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix typo in blueprint usage example (#506)
|
718,844 |
12.05.2022 15:26:31
| -10,800 |
16f4cbd9b6603e58e9d82083fa452ffe2e7fbd93
|
Fix `None` message
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.3.1\"\n+version = \"4.3.2\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "@@ -183,7 +183,9 @@ class BaseMessageMin(MessagesMessage, ABC):\n)\nfor k in deprecated:\ndata.pop(k)\n- if not isinstance(message, str):\n+ if message is None:\n+ message = \"\"\n+ elif not isinstance(message, str):\nmessage = str(message)\nstream = StringIO(message)\nwhile True:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/foreign_message.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/foreign_message.py",
"diff": "@@ -28,9 +28,7 @@ class ForeignMessageMin(BaseForeignMessageMin):\n@property\ndef is_mentioned(self) -> bool:\n- if not (self.mention and self.group_id):\n- return False\n- return self.mention.id == -self.group_id\n+ return self.mention.id == -self.group_id if (self.mention and self.group_id) else False\nForeignMessageMin.update_forward_refs()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message.py",
"diff": "@@ -36,9 +36,7 @@ class MessageMin(BaseMessageMin):\n@property\ndef is_mentioned(self) -> bool:\n- if not (self.mention and self.group_id):\n- return False\n- return self.mention.id == -self.group_id\n+ return self.mention.id == -self.group_id if (self.mention and self.group_id) else False\nasync def get_full_message(self) -> \"BaseMessageMin\":\nif self._is_full:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"diff": "@@ -111,6 +111,10 @@ class MessageEventMin(MessageEvent):\n)\nfor k in deprecated:\ndata.pop(k)\n+ if message is None:\n+ message = \"\"\n+ elif not isinstance(message, str):\n+ message = str(message)\nstream = StringIO(message)\nwhile True:\nmsg = stream.read(4096)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/user/foreign_message.py",
"new_path": "vkbottle/tools/dev/mini_types/user/foreign_message.py",
"diff": "@@ -25,9 +25,7 @@ class ForeignMessageMin(BaseForeignMessageMin):\n@property\ndef is_mentioned(self) -> bool:\n- if not (self.mention and self.user_id):\n- return False\n- return self.mention.id == self.user_id\n+ return self.mention.id == self.user_id if (self.mention and self.user_id) else False\nForeignMessageMin.update_forward_refs()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/user/message.py",
"new_path": "vkbottle/tools/dev/mini_types/user/message.py",
"diff": "@@ -14,7 +14,7 @@ class MessageMin(BaseMessageMin):\n@property\ndef is_mentioned(self) -> bool:\n- return False if not self.mention else self.mention.id == self.user_id\n+ return self.mention.id == self.user_id if self.mention else False\n@root_validator(pre=True)\ndef __foreign_messages(cls, values):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `None` message
|
718,844 |
31.05.2022 04:25:09
| -10,800 |
366d824234d91740e00cac0b01119c0fd298d919
|
Some fixes and object hashing (close
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.3.2\"\n+version = \"4.3.3\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nlicense = \"MIT\"\n@@ -41,7 +41,7 @@ aiohttp = \"^3.6.2\"\nchoicelib = \"^0.1.5\"\npydantic = \"^1.8.2\"\nvbml = \"^1.1.post1\"\n-vkbottle-types = \"^5.131.134\"\n+vkbottle-types = \"^5.131.146.3\"\nwatchgod = \">=0.7,<0.9\"\naiofiles = \"^0.8.0\"\ntyping-extensions = \"^4.0.1\"\n@@ -73,6 +73,9 @@ autoflake = \"^1.4\"\npre-commit = \"^2.17.0\"\nmypy-extensions = \"^0.4.3\"\n+[tool.pytest.ini_options]\n+asyncio_mode = \"auto\"\n+\n[tool.mypy]\npython_version = 3.8\nignore_missing_imports = true\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -70,7 +70,7 @@ class API(ABCAPI):\ndata=data, # type: ignore\nparams={\"access_token\": token, \"v\": self.API_VERSION},\n)\n- logger.debug(\"Request {} with {} data returned {}\".format(method, data, response))\n+ logger.debug(f\"Request {method} with {data} data returned {response}\")\nreturn await self.validate_response(method, data, response) # type: ignore\nasync def request_many(\n@@ -86,7 +86,7 @@ class API(ABCAPI):\ndata=data, # noqa\nparams={\"access_token\": token, \"v\": self.API_VERSION}, # noqa\n)\n- logger.debug(\"Request {} with {} data returned {}\".format(method, data, response))\n+ logger.debug(f\"Request {method} with {data} data returned {response}\")\nyield await self.validate_response(method, data, response) # type: ignore\nasync def validate_response(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "-from asyncio import AbstractEventLoop, get_event_loop\n+import asyncio\nfrom typing import TYPE_CHECKING, NoReturn, Optional, Tuple\nfrom vkbottle.api import API\n@@ -27,7 +27,7 @@ class Bot(ABCFramework):\napi: Optional[\"ABCAPI\"] = None,\npolling: Optional[\"ABCPolling\"] = None,\ncallback: Optional[\"ABCCallback\"] = None,\n- loop: Optional[AbstractEventLoop] = None,\n+ loop: Optional[asyncio.AbstractEventLoop] = None,\nloop_wrapper: Optional[LoopWrapper] = None,\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCLabeler\"] = None,\n@@ -116,11 +116,11 @@ class Bot(ABCFramework):\nawait self.router.route(event, self.callback.api)\n@property\n- def loop(self) -> AbstractEventLoop:\n+ def loop(self) -> asyncio.AbstractEventLoop:\nif self._loop is None:\n- self._loop = get_event_loop()\n+ self._loop = asyncio.get_event_loop()\nreturn self._loop\n@loop.setter\n- def loop(self, new_loop: AbstractEventLoop):\n+ def loop(self, new_loop: asyncio.AbstractEventLoop):\nself._loop = new_loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/multibot.py",
"new_path": "vkbottle/framework/bot/multibot.py",
"diff": "@@ -24,4 +24,4 @@ def run_multibot(\npolling = polling_type().construct(api_instance)\napi_instance.http_client = SingleAiohttpClient()\nbot.loop_wrapper.add_task(bot.run_polling(custom_polling=polling))\n- bot.loop_wrapper.run_forever(bot.loop)\n+ bot.loop_wrapper.run_forever()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -69,8 +69,8 @@ class User(ABCFramework):\ncls: Type[\"User\"],\nlogin: str,\npassword: str,\n- client_id: int = None,\n- client_secret: str = None,\n+ client_id: Optional[int] = None,\n+ client_secret: Optional[str] = None,\n**kwargs,\n):\nloop = get_event_loop()\n@@ -90,8 +90,8 @@ class User(ABCFramework):\ncls: Type[\"User\"],\nlogin: str,\npassword: str,\n- client_id: int = None,\n- client_secret: str = None,\n+ client_id: Optional[int] = None,\n+ client_secret: Optional[str] = None,\n**kwargs,\n):\ntoken = await UserAuth(client_id, client_secret).get_token(login, password)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/aiohttp.py",
"new_path": "vkbottle/http/aiohttp.py",
"diff": "-import asyncio\nfrom typing import TYPE_CHECKING, Any, Optional, Type, TypeVar\nfrom aiohttp import ClientSession, TCPConnector\nfrom vkbottle.modules import json as json_module\n+from vkbottle.modules import logger\nfrom .abc import ABCHTTPClient\n@@ -16,18 +16,18 @@ TSingleAiohttpClient = TypeVar(\"TSingleAiohttpClient\", bound=\"SingleAiohttpClien\nclass AiohttpClient(ABCHTTPClient):\ndef __init__(\nself,\n- loop: Optional[asyncio.AbstractEventLoop] = None,\nsession: Optional[ClientSession] = None,\njson_processing_module: Optional[Any] = None,\noptimize: bool = False,\n**kwargs,\n):\n- self.loop = loop or asyncio.get_event_loop()\nself.json_processing_module = json_processing_module or json_module\nif optimize:\nkwargs[\"skip_auto_headers\"] = {\"User-Agent\"}\nkwargs[\"raise_for_status\"] = True\n+ if kwargs.pop(\"loop\", None):\n+ logger.warning(\"loop argument is deprecated\")\nself.session = session\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tests/test_bot.py",
"new_path": "vkbottle/tests/test_bot.py",
"diff": "@@ -3,6 +3,7 @@ from typing import Any, Callable\nimport pytest\nimport vbml\n+from vkbottle_types.methods.base_category import BaseCategory\nfrom vkbottle import (\nAPI,\n@@ -79,12 +80,36 @@ class SecondMockState(BaseStateGroup):\nMOCK = 1\n+class MessagesCategory(BaseCategory):\n+ async def send(self, **data: Any) -> Any:\n+ return (await self.api.request(\"messages.send\", data))[\"response\"]\n+\n+\n+class GroupsCategory(BaseCategory):\n+ async def get_by_id(self, **data: Any) -> Any:\n+ return (await self.api.request(\"groups.getById\", data))[\"response\"]\n+\n+ async def get_long_poll_server(self, **data: Any) -> Any:\n+ return (await self.api.request(\"groups.getLongPollServer\", data))[\"response\"]\n+\n+\ndef set_http_callback(api: API, callback: Callable[[str, str, dict], Any]):\napi.http_client = MockedClient(callback=callback)\n-@pytest.mark.asyncio\nasync def test_bot_polling():\n+ class TestApi(API):\n+ def __init__(self, *args, **kwargs):\n+ super().__init__(*args, **kwargs)\n+\n+ @property\n+ def groups(self):\n+ return GroupsCategory(self)\n+\n+ @property\n+ def messages(self):\n+ return MessagesCategory(self)\n+\ndef callback(method: str, url: str, data: dict):\nif \"groups.getById\" in url:\nreturn {\"response\": [{\"id\": 1}]}\n@@ -93,9 +118,12 @@ async def test_bot_polling():\nelif \"!SERVER!\" in url:\nreturn EXAMPLE_EVENT\nelif \"messages.send\" in url:\n- return json.dumps({\"response\": {**data, **{\"r\": 1}}})\n+ _r = {**data, **{\"r\": 1}}\n+ if \"peer_ids\" in data:\n+ return {\"response\": [_r]}\n+ return {\"response\": _r}\n- bot = Bot(\"token\")\n+ bot = Bot(api=TestApi(\"token\"))\nset_http_callback(bot.api, callback)\n@bot.labeler.raw_event(GroupEventType.WALL_POST_NEW, GroupTypes.WallPostNew)\n@@ -107,9 +135,13 @@ async def test_bot_polling():\nasync def message_handler(message: Message):\nassert message.id == 100\nassert message.from_id == 1\n- assert await message.answer() == {\"peer_id\": message.peer_id, \"r\": 1, \"random_id\": 0}\n+ assert await message.answer() == {\n+ \"peer_ids\": f\"{message.peer_id}\",\n+ \"r\": 1,\n+ \"random_id\": 0,\n+ }\nassert await message.answer(some_unsigned_param=\"test\") == {\n- \"peer_id\": message.peer_id,\n+ \"peer_ids\": f\"{message.peer_id}\",\n\"random_id\": 0,\n\"some_unsigned_param\": \"test\",\n\"r\": 1,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"diff": "@@ -8,7 +8,7 @@ from vkbottle_types.objects import (\nMessagesForeignMessage,\nPhotosPhoto,\nUsersUserFull,\n- VideoVideo,\n+ VideoVideoFull,\nWallWallComment,\nWallWallpostFull,\n)\n@@ -28,6 +28,9 @@ class BaseForeignMessageMin(MessagesForeignMessage, ABC):\n__replace_mention = root_validator(replace_mention_validator, allow_reuse=True, pre=False) # type: ignore\n+ class Config:\n+ frozen = False\n+\n@property\ndef ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\nreturn getattr(self, \"unprepared_ctx_api\")\n@@ -100,7 +103,7 @@ class BaseForeignMessageMin(MessagesForeignMessage, ABC):\nreturn None\nreturn [attachment.photo for attachment in self.attachments if attachment.photo]\n- def get_video_attachments(self) -> Optional[List[\"VideoVideo\"]]:\n+ def get_video_attachments(self) -> Optional[List[\"VideoVideoFull\"]]:\nif self.attachments is None:\nreturn None\nreturn [attachment.video for attachment in self.attachments if attachment.video]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "@@ -11,7 +11,7 @@ from vkbottle_types.objects import (\nMessagesMessage,\nPhotosPhoto,\nUsersUserFull,\n- VideoVideo,\n+ VideoVideoFull,\nWallWallComment,\nWallWallpostFull,\n)\n@@ -38,6 +38,9 @@ class BaseMessageMin(MessagesMessage, ABC):\n__replace_mention = root_validator(replace_mention_validator, allow_reuse=True, pre=False) # type: ignore\n+ class Config:\n+ frozen = False\n+\n@property\ndef ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\nreturn getattr(self, \"unprepared_ctx_api\")\n@@ -118,7 +121,7 @@ class BaseMessageMin(MessagesMessage, ABC):\nreturn None\nreturn [attachment.photo for attachment in self.attachments if attachment.photo]\n- def get_video_attachments(self) -> Optional[List[\"VideoVideo\"]]:\n+ def get_video_attachments(self) -> Optional[List[\"VideoVideoFull\"]]:\nif self.attachments is None:\nreturn None\nreturn [attachment.video for attachment in self.attachments if attachment.video]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/user/foreign_message.py",
"new_path": "vkbottle/tools/dev/mini_types/user/foreign_message.py",
"diff": "@@ -20,7 +20,7 @@ class ForeignMessageMin(BaseForeignMessageMin):\nfor foreign_message in foreign_messages:\nforeign_message.unprepared_ctx_api = values[\"unprepared_ctx_api\"]\nforeign_message.replace_mention = values[\"replace_mention\"]\n- foreign_message.user_id = values[\"user_id\"]\n+ foreign_message.user_id = values.get(\"user_id\")\nreturn values\n@property\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/user/message.py",
"new_path": "vkbottle/tools/dev/mini_types/user/message.py",
"diff": "@@ -26,7 +26,7 @@ class MessageMin(BaseMessageMin):\nfor foreign_message in foreign_messages:\nforeign_message[\"unprepared_ctx_api\"] = values[\"unprepared_ctx_api\"]\nforeign_message[\"replace_mention\"] = values[\"replace_mention\"]\n- foreign_message[\"user_id\"] = values[\"user_id\"]\n+ foreign_message[\"user_id\"] = values.get(\"user_id\")\nreturn values\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_tools.py",
"new_path": "vkbottle/tools/tests/test_tools.py",
"diff": "@@ -253,7 +253,7 @@ def test_run_multibot(mocker: MockerFixture):\nmocker.patch(\"asyncio.iscoroutine\", lambda _: True)\nmocker.patch(\n\"vkbottle.tools.dev.loop_wrapper.LoopWrapper.run_forever\",\n- lambda s, l: bot_apis.extend(s.tasks),\n+ lambda s: bot_apis.extend(s.tasks),\n)\nrun_multibot(Bot(), (API(\"1\"), API(\"2\"), API(\"3\")))\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Some fixes and object hashing (close #465)
|
718,844 |
02.06.2022 21:14:17
| -10,800 |
458c015fb416728b893fba73e9d81f8838559934
|
Fix pydantic ValidationError (close
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/user/message.py",
"new_path": "vkbottle/tools/dev/mini_types/user/message.py",
"diff": "-from typing import TYPE_CHECKING, Optional\n+from typing import TYPE_CHECKING, List, Optional\nfrom pydantic import root_validator\nfrom ..base import BaseMessageMin\n+from .foreign_message import ForeignMessageMin\nif TYPE_CHECKING:\n-\nfrom vkbottle.api import ABCAPI\nclass MessageMin(BaseMessageMin):\nuser_id: Optional[int] = None\n+ reply_message: Optional[\"ForeignMessageMin\"] = None\n+ fwd_messages: Optional[List[\"ForeignMessageMin\"]] = []\n@property\ndef is_mentioned(self) -> bool:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix pydantic ValidationError (close #516)
|
718,844 |
10.07.2022 21:03:37
| -10,800 |
20685b9c35075d84ab133ff06edce47d00edb41f
|
Remove `/` from args in `StyleAdapter.log`
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.3.5\"\n+version = \"4.3.6\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\n-authors = [\"timoniq\", \"FeeeeK\"]\n+authors = [\"timoniq\"]\n+maintainers = [\"FeeeeK\"]\nlicense = \"MIT\"\nreadme = \"README.md\"\nhomepage = \"https://github.com/vkbottle/vkbottle\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/modules.py",
"new_path": "vkbottle/modules.py",
"diff": "@@ -63,7 +63,7 @@ elif logging_module.__name__ == \"logging\":\ndef __init__(self, logger, extra=None):\nsuper().__init__(logger, extra or {})\n- def log(self, level, msg, /, *args, **kwargs):\n+ def log(self, level, msg, *args, **kwargs):\nif self.isEnabledFor(level):\nmsg, args, kwargs = self.process(msg, args, kwargs)\nself.logger._log(level, msg, args, **kwargs)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Remove `/` from args in `StyleAdapter.log`
|
718,844 |
11.07.2022 01:43:18
| -10,800 |
a1b3df7fd11f8032d33cf97c61a2cbfb18bbeb18
|
Fix `RuntimeError` with `asyncio.run` on windows
See
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/modules.py",
"new_path": "vkbottle/modules.py",
"diff": "+import asyncio\n+\nfrom choicelib import choice_in_order\nfrom typing_extensions import Protocol\n@@ -80,3 +82,35 @@ elif logging_module.__name__ == \"logging\":\nreturn msg, args, log_kwargs\nlogger: Logger = StyleAdapter(logging_module.getLogger(\"vkbottle\")) # type: ignore\n+\n+if hasattr(asyncio, \"WindowsProactorEventLoopPolicy\") and isinstance(\n+ asyncio.get_event_loop_policy(), asyncio.WindowsProactorEventLoopPolicy\n+):\n+ \"\"\"\n+ This is a workaround for a bug in ProactorEventLoop:\n+ https://github.com/aio-libs/aiohttp/issues/4324\n+\n+ This also can be fixed by using loop.run_until_complete instead of asyncio.run\n+ but I like to use asyncio.run because it's more readable.\n+ \"\"\"\n+ from functools import wraps\n+ from asyncio.proactor_events import _ProactorBasePipeTransport, _ProactorBaseWritePipeTransport\n+\n+ def silence_exception(func):\n+ @wraps(func)\n+ def wrapper(*args, **kwargs):\n+ try:\n+ return func(*args, **kwargs)\n+ except (AttributeError, RuntimeError) as e:\n+ if str(e) not in (\n+ \"'NoneType' object has no attribute 'send'\",\n+ \"Event loop is closed\",\n+ ):\n+ raise\n+\n+ return wrapper\n+\n+ _ProactorBasePipeTransport.__del__ = silence_exception(_ProactorBasePipeTransport.__del__)\n+ _ProactorBaseWritePipeTransport._loop_writing = silence_exception( # type: ignore\n+ _ProactorBaseWritePipeTransport._loop_writing # type: ignore\n+ )\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `RuntimeError` with `asyncio.run` on windows
See https://github.com/aio-libs/aiohttp/issues/4324
|
718,844 |
11.07.2022 02:31:32
| -10,800 |
9acab6002946a9bd9cfbc09a604ada5fa6b84dd1
|
Update modules; fix mypy error
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/modules.py",
"new_path": "vkbottle/modules.py",
"diff": "@@ -18,39 +18,24 @@ class JSONModule(Protocol):\n...\n-class Logger(Protocol):\n- def info(self, msg, *args, **kwargs):\n- ...\n-\n- def debug(self, msg, *args, **kwargs):\n- ...\n-\n- def warning(self, msg, *args, **kwargs):\n- ...\n-\n- def error(self, msg, *args, **kwargs):\n- ...\n-\n- def critical(self, msg, *args, **kwargs):\n- ...\n-\n- def exception(self, msg, *args, **kwargs):\n- ...\n-\n- def log(self, level, msg, *args, **kwargs):\n- ...\n-\n-\njson: JSONModule = choice_in_order(\n[\"ujson\", \"hyperjson\", \"orjson\"], do_import=True, default=\"json\"\n)\n-logging_module = choice_in_order([\"loguru\"], do_import=True, default=\"logging\")\n+logging_module = choice_in_order([\"loguru\"], default=\"logging\")\n-if logging_module.__name__ == \"loguru\":\n- logger: Logger = getattr(logging_module, \"logger\") # type: ignore\n+if logging_module == \"loguru\":\n+ from loguru import logger # type: ignore\n+else:\n+ \"\"\"\n+ This is workaround for lazy formating with {} in logging.\n-elif logging_module.__name__ == \"logging\":\n+ About:\n+ https://docs.python.org/3/howto/logging-cookbook.html#use-of-alternative-formatting-styles\n+ \"\"\"\nimport inspect\n+ import logging\n+\n+ logging.basicConfig(level=logging.DEBUG)\nclass LogMessage:\ndef __init__(self, fmt, args, kwargs):\n@@ -61,7 +46,7 @@ elif logging_module.__name__ == \"logging\":\ndef __str__(self):\nreturn self.fmt.format(*self.args)\n- class StyleAdapter(logging_module.LoggerAdapter): # type: ignore\n+ class StyleAdapter(logging.LoggerAdapter):\ndef __init__(self, logger, extra=None):\nsuper().__init__(logger, extra or {})\n@@ -81,10 +66,14 @@ elif logging_module.__name__ == \"logging\":\nargs = ()\nreturn msg, args, log_kwargs\n- logger: Logger = StyleAdapter(logging_module.getLogger(\"vkbottle\")) # type: ignore\n+ logger = StyleAdapter(logging.getLogger(\"vkbottle\")) # type: ignore\n+ logger.info(\n+ \"logging is used as the default logger, but we recommend using loguru. \"\n+ \"It may also become a required dependency in future releases.\"\n+ )\nif hasattr(asyncio, \"WindowsProactorEventLoopPolicy\") and isinstance(\n- asyncio.get_event_loop_policy(), asyncio.WindowsProactorEventLoopPolicy\n+ asyncio.get_event_loop_policy(), asyncio.WindowsProactorEventLoopPolicy # type: ignore\n):\n\"\"\"\nThis is a workaround for a bug in ProactorEventLoop:\n@@ -93,8 +82,8 @@ if hasattr(asyncio, \"WindowsProactorEventLoopPolicy\") and isinstance(\nThis also can be fixed by using loop.run_until_complete instead of asyncio.run\nbut I like to use asyncio.run because it's more readable.\n\"\"\"\n- from functools import wraps\nfrom asyncio.proactor_events import _ProactorBasePipeTransport, _ProactorBaseWritePipeTransport\n+ from functools import wraps\ndef silence_exception(func):\n@wraps(func)\n@@ -110,7 +99,7 @@ if hasattr(asyncio, \"WindowsProactorEventLoopPolicy\") and isinstance(\nreturn wrapper\n- _ProactorBasePipeTransport.__del__ = silence_exception(_ProactorBasePipeTransport.__del__)\n+ _ProactorBasePipeTransport.__del__ = silence_exception(_ProactorBasePipeTransport.__del__) # type: ignore\n_ProactorBaseWritePipeTransport._loop_writing = silence_exception( # type: ignore\n_ProactorBaseWritePipeTransport._loop_writing # type: ignore\n)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update modules; fix mypy error
|
718,844 |
11.07.2022 02:35:56
| -10,800 |
ab5dc8b8147d8adceddb52b660768c223cc95242
|
Update required `vkbottle-types` version
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -42,7 +42,7 @@ aiohttp = \"^3.8.1\"\nchoicelib = \"^0.1.5\"\npydantic = \"^1.9.1\"\nvbml = \"^1.1.post1\"\n-vkbottle-types = \"^5.131.146.6\"\n+vkbottle-types = \"^5.131.146.9\"\nwatchfiles = \">=0.14,<0.16\"\naiofiles = \"^0.8.0\"\ntyping-extensions = \"^4.2.0\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update required `vkbottle-types` version
|
718,844 |
12.07.2022 09:44:32
| -10,800 |
8c0e1cd8a4775d986007695b25be8e832761112b
|
Some improvements in `AiohttpClient`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/aiohttp.py",
"new_path": "vkbottle/http/aiohttp.py",
"diff": "from typing import TYPE_CHECKING, Any, Optional, Type, TypeVar\n-from aiohttp import ClientSession, TCPConnector\n+from aiohttp import ClientSession\nfrom vkbottle.modules import json as json_module\nfrom vkbottle.modules import logger\n@@ -19,26 +19,31 @@ class AiohttpClient(ABCHTTPClient):\nsession: Optional[ClientSession] = None,\njson_processing_module: Optional[Any] = None,\noptimize: bool = False,\n- **kwargs,\n+ **session_params,\n):\n- self.json_processing_module = json_processing_module or json_module\n+ self.json_processing_module = (\n+ json_processing_module or session_params.pop(\"json_serialize\", None) or json_module\n+ )\nif optimize:\n- kwargs[\"skip_auto_headers\"] = {\"User-Agent\"}\n- kwargs[\"raise_for_status\"] = True\n- if kwargs.pop(\"loop\", None):\n+ session_params[\"skip_auto_headers\"] = {\"User-Agent\"}\n+ session_params[\"raise_for_status\"] = True\n+ if session_params.pop(\"loop\", None):\nlogger.warning(\"loop argument is deprecated\")\nself.session = session\n- self._session_params = kwargs\n+ self._session_params = session_params\nasync def request_raw(\n- self, url: str, method: str = \"GET\", data: Optional[dict] = None, **kwargs\n+ self,\n+ url: str,\n+ method: str = \"GET\",\n+ data: Optional[dict] = None,\n+ **kwargs,\n) -> \"ClientResponse\":\nif not self.session:\nself.session = ClientSession(\n- connector=TCPConnector(ssl=False),\njson_serialize=self.json_processing_module.dumps,\n**self._session_params,\n)\n@@ -47,7 +52,11 @@ class AiohttpClient(ABCHTTPClient):\nreturn response\nasync def request_json(\n- self, url: str, method: str = \"GET\", data: Optional[dict] = None, **kwargs\n+ self,\n+ url: str,\n+ method: str = \"GET\",\n+ data: Optional[dict] = None,\n+ **kwargs,\n) -> dict:\nresponse = await self.request_raw(url, method, data, **kwargs)\nreturn await response.json(\n@@ -55,13 +64,21 @@ class AiohttpClient(ABCHTTPClient):\n)\nasync def request_text(\n- self, url: str, method: str = \"GET\", data: Optional[dict] = None, **kwargs\n+ self,\n+ url: str,\n+ method: str = \"GET\",\n+ data: Optional[dict] = None,\n+ **kwargs,\n) -> str:\nresponse = await self.request_raw(url, method, data, **kwargs)\nreturn await response.text(encoding=\"utf-8\")\nasync def request_content(\n- self, url: str, method: str = \"GET\", data: Optional[dict] = None, **kwargs\n+ self,\n+ url: str,\n+ method: str = \"GET\",\n+ data: Optional[dict] = None,\n+ **kwargs,\n) -> bytes:\nresponse = await self.request_raw(url, method, data, **kwargs)\nreturn response._body\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Some improvements in `AiohttpClient`
|
718,844 |
12.07.2022 11:34:42
| -10,800 |
352db0acbb1bac5d16adcf3164916bd61edbd769
|
Fix mkdocs warnings about nav
|
[
{
"change_type": "MODIFY",
"old_path": "mkdocs-requirements.txt",
"new_path": "mkdocs-requirements.txt",
"diff": "-mkdocs<2.0.0\n-mkdocs-material<9.0.0\n+mkdocs==1.2.4\n+mkdocs-material==8.2.7\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -66,8 +66,8 @@ pytest-cov = \"^3.0.0\"\npytest-mock = \"^3.7.0\"\n# Docs\n-mkdocs = \"^1.2.3\"\n-mkdocs-material = \"^8.1.8\"\n+mkdocs = \"^1.2.4\"\n+mkdocs-material = \"^8.2.7\"\n# Pre-commit\nautoflake = \"^1.4\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix mkdocs warnings about nav
|
718,844 |
14.07.2022 17:06:34
| -10,800 |
999e5dbf30b8bc26ef93e84dc245c2d39ef6c957
|
Fix `JSONResponseValidator`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/json_validator.py",
"new_path": "vkbottle/api/response_validator/json_validator.py",
"diff": "-from typing import TYPE_CHECKING, Any, NoReturn, Union\n+import contextlib\n+from typing import TYPE_CHECKING, Any, NoReturn, Optional, Union\nfrom vkbottle.modules import json, logger\n@@ -13,6 +14,9 @@ class JSONResponseValidator(ABCResponseValidator):\nDocumentation: https://github.com/vkbottle/vkbottle/blob/master/docs/low-level/api/response-validator.md\n\"\"\"\n+ def __init__(self, context: Optional[dict] = None):\n+ self.context = context or {}\n+\nasync def validate(\nself,\nmethod: str,\n@@ -23,17 +27,23 @@ class JSONResponseValidator(ABCResponseValidator):\nif isinstance(response, dict):\nreturn response\nelif isinstance(response, str):\n+ with contextlib.suppress(ValueError):\nreturn json.loads(response)\n+ if self.context.get(\"reschedule\"):\n+ return\n+\nlogger.info(\n\"VK returned object of invalid type ({}). Request will be rescheduled with {}\",\ntype(response).__name__,\nctx_api.request_rescheduler.__class__.__name__,\n)\n-\n- return await self.validate(\n+ self.context[\"reschedule\"] = True\n+ response = await self.validate(\nmethod,\ndata,\nawait ctx_api.request_rescheduler.reschedule(ctx_api, method, data, response),\nctx_api,\n)\n+ self.context.pop(\"reschedule\")\n+ return response\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"new_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"diff": "@@ -26,7 +26,7 @@ class VKAPIErrorResponseValidator(ABCResponseValidator):\n) -> Union[Any, NoReturn]:\nif \"error\" not in response:\nif \"response\" not in response:\n- # invalid response, just igrnore it\n+ # invalid response, just ignore it\nreturn response\nelif isinstance(response[\"response\"], list):\nerrors = [item[\"error\"] for item in response[\"response\"] if \"error\" in item]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `JSONResponseValidator`
|
718,844 |
14.07.2022 19:35:53
| -10,800 |
40608006c661d4dc28c755f8f57d1cbdc66601a5
|
New log format
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/modules.py",
"new_path": "vkbottle/modules.py",
"diff": "@@ -24,8 +24,22 @@ json: JSONModule = choice_in_order(\nlogging_module = choice_in_order([\"loguru\"], default=\"logging\")\nif logging_module == \"loguru\":\n+ import os\n+ import sys\n+\n+ if not os.environ.get(\"LOGURU_AUTOINIT\"):\n+ os.environ[\"LOGURU_AUTOINIT\"] = \"0\"\nfrom loguru import logger # type: ignore\n-else:\n+\n+ if not logger._core.handlers: # type: ignore\n+ log_format = (\n+ \"<level>{level: <8}</level> | \"\n+ \"{time:YYYY-MM-DD HH:mm:ss} | \"\n+ \"{name}:{function}:{line} > <level>{message}</level>\"\n+ )\n+ logger.add(sys.stderr, format=log_format, enqueue=True, colorize=True)\n+\n+elif logging_module == \"logging\":\n\"\"\"\nThis is workaround for lazy formating with {} in logging.\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
New log format
|
718,844 |
15.07.2022 11:38:20
| -10,800 |
2245e1e25841a2f6dcfc1dea91a9ed2bfb8f53b9
|
Fix mypy issue; Bump mkdocs version
|
[
{
"change_type": "MODIFY",
"old_path": "mkdocs-requirements.txt",
"new_path": "mkdocs-requirements.txt",
"diff": "-mkdocs==1.2.4\n-mkdocs-material==8.2.7\n+mkdocs>=1.3.0\n+mkdocs-material>=8.3.9\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -43,14 +43,14 @@ choicelib = \"^0.1.5\"\npydantic = \"^1.9.1\"\nvbml = \"^1.1.post1\"\nvkbottle-types = \"^5.131.146.9\"\n-watchfiles = \">=0.14,<0.16\"\n+watchfiles = \"^0.15.0\"\naiofiles = \"^0.8.0\"\n-typing-extensions = \"^4.2.0\"\n+typing-extensions = \"^4.3.0\"\n[tool.poetry.dev-dependencies]\n# Lint\nblack = {version = \"^22.1\", allow-prereleases = true}\n-flake8 = \"^4.0.1\"\n+flake8 = \"^3.9.2\"\nisort = \"^5.10.1\"\nlxml = \"^4.9.0\"\nmypy = \"^0.961\"\n@@ -66,8 +66,8 @@ pytest-cov = \"^3.0.0\"\npytest-mock = \"^3.7.0\"\n# Docs\n-mkdocs = \"^1.2.4\"\n-mkdocs-material = \"^8.2.7\"\n+mkdocs = \"^1.3.0\"\n+mkdocs-material = \"^8.3.9\"\n# Pre-commit\nautoflake = \"^1.4\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/json_validator.py",
"new_path": "vkbottle/api/response_validator/json_validator.py",
"diff": "@@ -31,7 +31,7 @@ class JSONResponseValidator(ABCResponseValidator):\nreturn json.loads(response)\nif self.context.get(\"reschedule\"):\n- return\n+ return None\nlogger.info(\n\"VK returned object of invalid type ({}). Request will be rescheduled with {}\",\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix mypy issue; Bump mkdocs version
|
718,844 |
15.07.2022 14:29:11
| -10,800 |
4a19a35376b5fae13ad5236fca2c079bbd7049ac
|
Remove str.format from logs
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.3.7\"\n+version = \"4.3.8\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nmaintainers = [\"FeeeeK\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc/message.py",
"new_path": "vkbottle/dispatch/views/abc/message.py",
"diff": "@@ -44,7 +44,7 @@ class ABCMessageView(ABCDispenseView[T_contra, F_contra], ABC, Generic[T_contra,\n) -> None:\n# For user event mapping, consider checking out\n# https://dev.vk.com/api/user-long-poll/getting-started\n- logger.debug(\"Handling event ({}) with message view\".format(self.get_event_type(event)))\n+ logger.debug(\"Handling event ({}) with message view\", self.get_event_type(event))\ncontext_variables: dict = {}\nmessage = await self.get_message(event, ctx_api, self.replace_mention)\nmessage.state_peer = await state_dispenser.cast(self.get_state_key(message))\n@@ -62,7 +62,7 @@ class ABCMessageView(ABCDispenseView[T_contra, F_contra], ABC, Generic[T_contra,\nfor handler in self.handlers:\nresult = await handler.filter(message)\n- logger.debug(\"Handler {} returned {}\".format(handler, result))\n+ logger.debug(\"Handler {} returned {}\", handler, result)\nif result is False:\ncontinue\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc/raw.py",
"new_path": "vkbottle/dispatch/views/abc/raw.py",
"diff": "@@ -31,7 +31,7 @@ class ABCRawEventView(ABCView[T_contra], Generic[T_contra]):\nasync def handle_event(\nself, event: T_contra, ctx_api: \"ABCAPI\", state_dispenser: \"ABCStateDispenser\"\n) -> Any:\n- logger.debug(\"Handling event ({}) with message view\".format(self.get_event_type(event)))\n+ logger.debug(\"Handling event ({}) with message view\", self.get_event_type(event))\ncontext_variables: dict = {}\nhandle_responses = []\n@@ -51,7 +51,7 @@ class ABCRawEventView(ABCView[T_contra], Generic[T_contra]):\nsetattr(event_model, \"unprepared_ctx_api\", ctx_api)\nresult = await handler_basement.handler.filter(event_model)\n- logger.debug(\"Handler {} returned {}\".format(handler_basement.handler, result))\n+ logger.debug(\"Handler {} returned {}\", handler_basement.handler, result)\nif result is False:\ncontinue\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Remove str.format from logs
|
718,842 |
15.07.2022 22:40:41
| -10,800 |
a36bab7ec19f41d52479c6fb624ec69c6d9d8987
|
Cache .mypy_cache directory in ci.yml
Bump setup-python version
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -26,7 +26,14 @@ jobs:\n- name: Install poetry\nrun: pipx install poetry\n- - uses: actions/setup-python@v3.1.1\n+ - name: Cache .mypy_cache\n+ id: cache-mypy\n+ uses: actions/cache@v3\n+ with:\n+ key: ${{ matrix.python-version }}-${{ runner.os }}\n+ path: .mypy_cache\n+\n+ - uses: actions/setup-python@v4.1.0\nid: python-setup\nwith:\npython-version: ${{ matrix.python-version }}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Cache .mypy_cache directory in ci.yml (#527)
Bump setup-python version
|
718,844 |
21.07.2022 14:51:58
| -10,800 |
d922d3b8a62c0c0af28ba13052d5fe05d57c5258
|
Refactor User Auth flow
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/auth.py",
"new_path": "vkbottle/tools/dev/auth.py",
"diff": "from typing import Optional\n+from vkbottle.exception_factory import CaptchaError, VKAPIError\nfrom vkbottle.http.aiohttp import SingleAiohttpClient\nMOBILE_APP_ID = 2274003\nMOBILE_APP_SECRET = \"hHbZxrka2uZ6jB1inYsH\"\n-class AuthError(Exception):\n- def __init__(self, typ: str, description: str):\n- super().__init__(description)\n- self.type = typ\n- self.description = description\n+class AuthError(VKAPIError):\n+ pass\nclass UserAuth:\n+ AUTH_URL = \"https://oauth.vk.com/token\"\n+\ndef __init__(self, client_id: Optional[int] = None, client_secret: Optional[str] = None):\nif client_id is not None and client_secret is not None:\nself.client_id = client_id\n@@ -22,19 +22,28 @@ class UserAuth:\nself.client_id = MOBILE_APP_ID\nself.client_secret = MOBILE_APP_SECRET\n- def _build_oauth_url(self, login: str, password: str) -> str:\n- return (\n- f\"https://oauth.vk.com/token?grant_type=password&client_id={self.client_id}\"\n- f\"&client_secret={self.client_secret}&username={login}&password={password}\"\n- )\n+ def _get_params(self, login: str, password: str) -> dict:\n+ return {\n+ \"grant_type\": \"password\",\n+ \"client_id\": self.client_id,\n+ \"client_secret\": self.client_secret,\n+ \"username\": login,\n+ \"password\": password,\n+ }\nasync def get_token(self, login: str, password: str) -> str:\n- url = self._build_oauth_url(login, password)\n+ params = self._get_params(login, password)\nclient = SingleAiohttpClient()\n- response = await client.request_json(url)\n+ response = await client.request_json(\n+ url=self.AUTH_URL,\n+ method=\"POST\",\n+ data=params,\n+ )\nif \"access_token\" in response:\nreturn response[\"access_token\"]\n-\n- raise AuthError(response[\"error\"], response[\"error_description\"])\n+ response[\"error_msg\"] = response.pop(\"error\")\n+ if response[\"error_msg\"] == \"need_captcha\":\n+ raise CaptchaError(**response, request_params=[])\n+ raise AuthError(**response, request_params=[])\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Refactor User Auth flow
|
718,844 |
10.08.2022 04:48:34
| -10,800 |
bdb09e51c724e03dce814ff57e43e5431d642ca3
|
Add `http_client` settings to `UsetAuth`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/auth.py",
"new_path": "vkbottle/tools/dev/auth.py",
"diff": "-from typing import Optional\n+from typing import TYPE_CHECKING, Optional\nfrom vkbottle.exception_factory import CaptchaError, VKAPIError\n-from vkbottle.http.aiohttp import SingleAiohttpClient\n+from vkbottle.http import SingleAiohttpClient\n+\n+if TYPE_CHECKING:\n+ from vkbottle.http import ABCHTTPClient\nMOBILE_APP_ID = 2274003\nMOBILE_APP_SECRET = \"hHbZxrka2uZ6jB1inYsH\"\n@@ -14,7 +17,12 @@ class AuthError(VKAPIError):\nclass UserAuth:\nAUTH_URL = \"https://oauth.vk.com/token\"\n- def __init__(self, client_id: Optional[int] = None, client_secret: Optional[str] = None):\n+ def __init__(\n+ self,\n+ client_id: Optional[int] = None,\n+ client_secret: Optional[str] = None,\n+ http_client: Optional[\"ABCHTTPClient\"] = None,\n+ ):\nif client_id is not None and client_secret is not None:\nself.client_id = client_id\nself.client_secret = client_secret\n@@ -22,6 +30,8 @@ class UserAuth:\nself.client_id = MOBILE_APP_ID\nself.client_secret = MOBILE_APP_SECRET\n+ self.http_client = http_client or SingleAiohttpClient()\n+\ndef _get_params(self, login: str, password: str) -> dict:\nreturn {\n\"grant_type\": \"password\",\n@@ -34,8 +44,7 @@ class UserAuth:\nasync def get_token(self, login: str, password: str) -> str:\nparams = self._get_params(login, password)\n- client = SingleAiohttpClient()\n- response = await client.request_json(\n+ response = await self.http_client.request_json(\nurl=self.AUTH_URL,\nmethod=\"POST\",\ndata=params,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add `http_client` settings to `UsetAuth`
|
718,844 |
18.08.2022 06:41:45
| -10,800 |
ac696a0053c7ea380eb8a7cf4a77ce7a1ed27a3e
|
Update template generator (fix
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/template/element.py",
"new_path": "vkbottle/tools/dev/template/element.py",
"diff": "from typing import List, Optional, Union\nfrom vkbottle.modules import json\n+from vkbottle.tools.dev.keyboard import Keyboard\n+from vkbottle.tools.dev.keyboard.button import KeyboardButton\nclass TemplateElement:\n@@ -11,15 +13,21 @@ class TemplateElement:\ntitle: Optional[str] = None,\ndescription: Optional[str] = None,\nphoto_id: Optional[str] = None,\n- buttons: Optional[Union[List[dict], str]] = None,\n+ buttons: Optional[Union[List[KeyboardButton], List[dict], str]] = None,\naction: Optional[dict] = None,\n):\nassert buttons, \"Buttons are required\"\nassert photo_id or title, \"photo_id or title is required\"\nif isinstance(buttons, str):\n- buttons = json.loads(buttons) # type: ignore\n+ buttons = json.loads(buttons)[\"buttons\"][0] # type: ignore\nif isinstance(buttons, dict):\nbuttons = buttons[\"buttons\"][0] # type: ignore\n+\n+ if isinstance(buttons, Keyboard):\n+ buttons = [button.get_data() for button in buttons.buttons[0]]\n+\n+ if all(isinstance(button, KeyboardButton) for button in buttons): # type: ignore\n+ buttons = [button.get_data() for button in buttons] # type: ignore\nself.raw: dict = {k: v for k, v in locals().items() if v is not None and k != \"self\"}\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update template generator (fix #536)
|
718,844 |
18.08.2022 16:27:31
| -10,800 |
7fc10d5378be6f3c6301930f9f33afba4810ccdc
|
Some fixes in UserAuth
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/auth.py",
"new_path": "vkbottle/tools/dev/auth.py",
"diff": "-from typing import TYPE_CHECKING, Optional\n+from typing import TYPE_CHECKING, List, Optional\nfrom vkbottle.exception_factory import CaptchaError, VKAPIError\nfrom vkbottle.http import SingleAiohttpClient\n@@ -10,8 +10,20 @@ MOBILE_APP_ID = 2274003\nMOBILE_APP_SECRET = \"hHbZxrka2uZ6jB1inYsH\"\n-class AuthError(VKAPIError):\n- pass\n+class AuthError(VKAPIError[0]): # type: ignore\n+ def __init__(\n+ self,\n+ *,\n+ error_description: str,\n+ error_type: str,\n+ error_msg: str,\n+ request_params: Optional[List[dict]] = None,\n+ ):\n+ request_params = request_params or []\n+ super().__init__(error_msg=error_msg, request_params=request_params)\n+ self.error_msg = error_msg\n+ self.error_type = error_type\n+ self.error_description = error_description\nclass UserAuth:\n@@ -39,6 +51,7 @@ class UserAuth:\n\"client_secret\": self.client_secret,\n\"username\": login,\n\"password\": password,\n+ \"scope\": 501202911,\n}\nasync def get_token(self, login: str, password: str) -> str:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Some fixes in UserAuth
|
718,844 |
04.09.2022 02:27:50
| -10,800 |
7b3de1fe271a5656c094f1fbd6464084397b4085
|
Fix keyboard generator (close
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/keyboard/button.py",
"new_path": "vkbottle/tools/dev/keyboard/button.py",
"diff": "from typing import TYPE_CHECKING, Any, Dict, Optional, Type\n-if TYPE_CHECKING:\n- from .action import ABCAction\n+from .action import ABCAction, Callback, Location, OpenLink, Text, VKApps, VKPay\nfrom .color import KeyboardButtonColor\n+KEYBOARD_ACTIONS = {\n+ \"text\": Text,\n+ \"open_link\": OpenLink,\n+ \"callback\": Callback,\n+ \"location\": Location,\n+ \"vkpay\": VKPay,\n+ \"open_app\": VKApps,\n+}\n+\nclass KeyboardButton:\n- def __init__(\n- self,\n- action: \"ABCAction\",\n- color: Optional[\"KeyboardButtonColor\"] = None,\n- data: Optional[dict] = None,\n- ):\n+ def __init__(self, action: \"ABCAction\", color: Optional[\"KeyboardButtonColor\"] = None):\n+ if not isinstance(action, ABCAction):\n+ raise TypeError(\"action must be instance of ABCAction\")\n+ if color and not isinstance(color, KeyboardButtonColor):\n+ raise TypeError(\"color must be instance of KeyboardButtonColor\")\nself.action = action\nself.color = color\n- self.data = data\n@classmethod\ndef from_typed(\n@@ -22,29 +28,21 @@ class KeyboardButton:\naction: \"ABCAction\",\ncolor: Optional[\"KeyboardButtonColor\"] = None,\n) -> \"KeyboardButton\":\n- return cls(action, color, None)\n+ return cls(action, color)\n@classmethod\ndef from_dict(cls: Type[\"KeyboardButton\"], data: dict) -> \"KeyboardButton\":\n- color = data.get(\"color\")\n- keyboard_data = {\"action\": data}\n- if color is not None:\n- keyboard_data[\"action\"].pop(\"color\")\n- keyboard_data[\"color\"] = color\n- return cls(cls.action, cls.color, keyboard_data) # type: ignore\n+ action_type = KEYBOARD_ACTIONS.get(data.pop(\"type\", None))\n+ color = data.pop(\"color\", None)\n+ if color:\n+ color = KeyboardButtonColor(color)\n+ if action_type is None:\n+ raise ValueError(\"KeyboardButton action type is not defined\")\n- def get_data(self) -> dict:\n- if self.data is not None:\n- return self.data\n+ return cls(action_type(**data), color)\n+ def get_data(self) -> dict:\ndata: Dict[str, Any] = {\"action\": self.action.get_data()}\n- if (\n- self.action.type\n- in (\n- \"text\",\n- \"callback\",\n- )\n- and self.color\n- ):\n+ if self.action.type in (\"text\", \"callback\") and self.color:\ndata[\"color\"] = self.color.value\nreturn data\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix keyboard generator (close #546)
|
718,844 |
04.09.2022 02:34:08
| -10,800 |
88c70ea08ebdc804ebdc317dd3ab49b010429513
|
Fix F401 flake error
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/keyboard/button.py",
"new_path": "vkbottle/tools/dev/keyboard/button.py",
"diff": "-from typing import TYPE_CHECKING, Any, Dict, Optional, Type\n+from typing import Any, Dict, Optional, Type\nfrom .action import ABCAction, Callback, Location, OpenLink, Text, VKApps, VKPay\nfrom .color import KeyboardButtonColor\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix F401 flake error
|
718,844 |
05.09.2022 20:42:26
| -10,800 |
2f232d2886e3730b168029625838d308e6b11325
|
Update vkscript converter
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/vkscript_converter/base_converter.py",
"new_path": "vkbottle/tools/dev/vkscript_converter/base_converter.py",
"diff": "@@ -27,17 +27,37 @@ class Converter:\n)\nreturn self.definitions[d.__class__](d)\n- def scriptify(self, func: Callable, **values) -> str:\n+ def scriptify(self, func: Callable, *args_values, **kwargs_values) -> str:\n\"\"\"Translate function to VKScript\"\"\"\nsource = getsource(func)\ncode: ast.FunctionDef = ast.parse(source).body[0] # type: ignore\n+ # Check if function has *args or **kwargs\n+ if code.args.vararg or code.args.kwarg:\n+ raise ConverterError(\"VKScript converter doesn't support *args and **kwargs\")\n+ # Get list of function arguments names\nargs = [a.arg for a in code.args.args]\n- args.pop(0)\n- if any(v not in values for v in args):\n- raise ConverterError(\n- \"All values should be passed to func. Predefined kwargs are not allowed\"\n- )\n- values_assignments = [f\"var {k}={v!r};\" for k, v in values.items()]\n+ # Get list of function arguments default values\n+ defaults = [self.find_definition(d) for d in code.args.defaults]\n+ # Check that first argument is api\n+ if not args or args[0] != \"api\":\n+ raise ConverterError(\"First argument must be api\")\n+ # Remove api from args\n+ args = args[1:]\n+ # Cycle through function arguments and check if they values are passed\n+ for arg, v in zip(args, args_values):\n+ if arg in kwargs_values:\n+ continue\n+ kwargs_values[arg] = v\n+ # Default values are used if values are not passed\n+ # eg func(a, b=2, c=3) -> func(1, 3), args = [a=1, b=3, c=3], defaults = [2, 3]\n+ for arg in args[::-1]:\n+ if not defaults and arg not in kwargs_values:\n+ raise ConverterError(f\"Argument {arg} is not provided\")\n+ if arg in kwargs_values:\n+ continue\n+ kwargs_values[arg] = defaults.pop()\n+ # Create assignments for every argument as variable\n+ values_assignments = [f\"var {k}={v};\" for k, v in kwargs_values.items()]\nreturn \"\".join(values_assignments) + \"\".join(\nself.find_definition(line) for line in code.body\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"new_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"diff": "import ast\nimport random\nimport string\n-from typing import Callable, Iterable\n+from typing import Any, Callable, Iterable\n-from typing_extensions import Protocol\n+from typing_extensions import Concatenate, ParamSpec\n+\n+from vkbottle import ABCAPI\nfrom .base_converter import Converter, ConverterError\nCALL_REPLACEMENTS = {\n\"append\": \"push\",\n\"pop\": \"pop\",\n+ \"sort\": \"sort\",\n+ \"index\": \"indexOf\",\n}\nCALL_STRING = [\"join\", \"strip\", \"split\"]\n+CALL_TYPES = {\n+ \"str\": \"toString\",\n+}\nconverter = Converter()\nfind = converter.find_definition\n@@ -101,25 +108,35 @@ def lt_operator(_: ast.Lt):\n@converter(ast.GtE)\n-def gt_operator_1(_: ast.GtE):\n+def gte_operator(_: ast.GtE):\nreturn \">=\"\n@converter(ast.LtE)\n-def gt_operator_2(_: ast.LtE):\n+def lte_operator(_: ast.LtE):\nreturn \"<=\"\n@converter(ast.Eq)\n-def gt_operator_3(_: ast.Eq):\n+def eq_operator(_: ast.Eq):\nreturn \"==\"\n+@converter(ast.Is)\n+def is_operator(_: ast.Is):\n+ return \"===\"\n+\n+\n@converter(ast.NotEq)\n-def gt_operator_4(_: ast.Gt):\n+def noteq_operator(_: ast.Gt):\nreturn \"!=\"\n+@converter(ast.IsNot)\n+def isnot_operator(_: ast.IsNot):\n+ return \"!==\"\n+\n+\n@converter(ast.And)\ndef and_operator(_: ast.And):\nreturn \"&&\"\n@@ -140,6 +157,19 @@ def aug_assign(d: ast.AugAssign):\n@converter(ast.Constant)\ndef constant(d: ast.Constant):\n+ # Since python 3.8 ast.Constant is used\n+ # instead of ast.Num, ast.Str, ast.Bytes and ast.NameConstant\n+ if isinstance(d.value, bool):\n+ return \"true\" if d.value else \"false\"\n+ elif d.value is None:\n+ return \"null\"\n+ elif isinstance(d.value, str):\n+ return repr(d.value)\n+ elif isinstance(d.value, bytes):\n+ return repr(d.value.decode())\n+ elif isinstance(d.value, int):\n+ return str(d.value)\n+ else:\nreturn d.value\n@@ -153,7 +183,7 @@ def while_cycle(d: ast.While):\nif d.orelse:\nraise ConverterError(\"You can't use while or/else in vkscript\")\nbody = \"\".join(find(line) for line in d.body)\n- return \"while(\" + find(d.test) + \"){\" + body + \"};\"\n+ return f\"while({find(d.test)}\" + \"){\" + body + \"};\"\n@converter(ast.For)\n@@ -181,29 +211,42 @@ def if_statement(d: ast.If):\n@converter(ast.Call)\ndef call(d: ast.Call):\n- func: ast.Attribute = d.func # type: ignore\n- calls = []\n-\n- while isinstance(func, ast.Attribute):\n- calls.append(func.attr)\n- func = func.value # type: ignore\n- if func.__class__ == ast.Str:\n- if calls[0] in CALL_STRING:\n- return str(find(d.args[0])) + \".\" + calls[0] + \"(\" + find(func) + \")\"\n- elif calls[0] == \"format\":\n- raise ConverterError(\"Use f-strings instead of str.format\")\n- raise ConverterError(\"String formatter\")\n-\n- if func.id.lower() == \"api\":\n- params = dispatch_keywords(d.keywords)\n- return \"API.\" + \".\".join(map(to_camel_case, 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 + \")\" # type: ignore\n- elif calls[0] in CALL_STRING:\n- return find(func) + \".\" + calls[0] + \"(\" + find(d.args[0]) + \")\"\n+ args = [find(arg) for arg in d.args]\n+ if isinstance(d.func, ast.Name):\n+ if d.func.id in CALL_TYPES:\n+ # function call like str()\n+ # eg str(1) -> 1.toString()\n+ return f\"{args[0]}.{CALL_TYPES[d.func.id]}({','.join(args[1:])})\"\n+ elif d.func.id == \"int\":\n+ return f\"parseInt({','.join(args)})\"\n+ elif isinstance(d.func, ast.Attribute):\n+ value = find(d.func.value)\n+ # array functions like array.pop()\n+ if d.func.attr in CALL_REPLACEMENTS:\n+ return f\"{value}.{CALL_REPLACEMENTS[d.func.attr]}({','.join(args)})\"\n+ # .split .join etc\n+ elif d.func.attr in CALL_STRING:\n+ return f\"{value}.{d.func.attr}({','.join(args)})\"\n+ elif d.func.attr == \"extend\":\n+ # vkscript doesn't have extend function, so we need to use push in loop\n+ random_iter_name = f\"__iter_{random_string(5)}__\"\n+ return (\n+ f\"var {random_iter_name} = {args[0]};\"\n+ f\"while({random_iter_name}.length > 0){{\"\n+ f\"{find(d.func.value)}.push({random_iter_name}.pop());}}\"\n+ )\n+\n+ elif (\n+ isinstance(d.func.value, ast.Attribute)\n+ and isinstance(d.func.value.value, ast.Name)\n+ and d.func.value.value.id == \"api\"\n+ ):\n+ return (\n+ f\"API.{to_camel_case(d.func.value.attr)}.{to_camel_case(d.func.attr)}\"\n+ + \"({\"\n+ + dispatch_keywords(d.keywords)\n+ + \"})\"\n+ )\nraise ConverterError(f\"Call for {getattr(d.func, 'attr', d.func.__dict__)} is not referenced\")\n@@ -214,7 +257,7 @@ def pass_expr(_: ast.Pass):\n@converter(ast.Expr)\ndef expr(d: ast.Expr):\n- return find(d.value) + \";\"\n+ return f\"{find(d.value)};\"\n@converter(ast.Module)\n@@ -285,7 +328,7 @@ def num_type(d: ast.Num):\n@converter(ast.Str)\n-def str_type(d: ast.Num):\n+def str_type(d: ast.Str):\nreturn repr(d.s)\n@@ -311,13 +354,14 @@ def name_constant_type(d: ast.NameConstant):\nreturn consts[d.value]\n-class VKScriptFunction(Protocol):\n- def __call__(self, **kwargs) -> str:\n- ...\n+# Just a few typing magic\n+# How it works:\n+# func(api: ABCAPI, a: int, b: str) -> func(a: int, b: str)\n+P = ParamSpec(\"P\")\n-def vkscript(func: Callable) -> VKScriptFunction:\n- def decorator(**context):\n- return converter.scriptify(func, **context)\n+def vkscript(func: Callable[Concatenate[ABCAPI, P], Any]) -> Callable[P, str]:\n+ def decorator(*args: P.args, **context: P.kwargs) -> str:\n+ return converter.scriptify(func, *args, **context)\nreturn decorator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_vkscript_converter.py",
"new_path": "vkbottle/tools/tests/test_vkscript_converter.py",
"diff": "@@ -23,11 +23,11 @@ def api_request(api, group_id):\ndef types(api):\na = 5.1\nb = 5 * a\n- results = [b, b - 2]\n- _ = {\"a\": 1, \"b\": 2}\n- _ = True\n- _ = 3 - 3.3 + 3.0 * 0.3 / 33 % 3\n- _ = \"string\"\n+ results = [b, b - 2, \"a\"]\n+ _a = {\"a\": 1, \"b\": 2}\n+ _a = True\n+ _a = 3 - 3.3 + 3.0 * 0.3 / 33 % 3\n+ _a = \"string\" + \"string\"\nif a < 5:\npass\n@@ -38,8 +38,7 @@ def types(api):\nwhile a < b:\na *= 1.1\n- for i in results:\n- results.append(i**2)\n+ results.extend([_a, b])\nresults.pop()\nreturn results\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update vkscript converter
|
718,844 |
05.09.2022 20:50:11
| -10,800 |
4516b867ca128af5ebc030398bd135d3c29b4a56
|
Change vkscript `extend` convertation
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"new_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"diff": "@@ -228,14 +228,7 @@ def call(d: ast.Call):\nelif d.func.attr in CALL_STRING:\nreturn f\"{value}.{d.func.attr}({','.join(args)})\"\nelif d.func.attr == \"extend\":\n- # vkscript doesn't have extend function, so we need to use push in loop\n- random_iter_name = f\"__iter_{random_string(5)}__\"\n- return (\n- f\"var {random_iter_name} = {args[0]};\"\n- f\"while({random_iter_name}.length > 0){{\"\n- f\"{find(d.func.value)}.push({random_iter_name}.pop());}}\"\n- )\n-\n+ return f\"{find(d.func.value)} = {find(d.func.value)} + {args[0]}\"\nelif (\nisinstance(d.func.value, ast.Attribute)\nand isinstance(d.func.value.value, ast.Name)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Change vkscript `extend` convertation
|
718,844 |
06.09.2022 01:54:55
| -10,800 |
5244863b94fd5067cb0ddb093edff222e85c1135
|
Change vkscript `extend` convertation (again)
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"new_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"diff": "@@ -228,7 +228,8 @@ def call(d: ast.Call):\nelif d.func.attr in CALL_STRING:\nreturn f\"{value}.{d.func.attr}({','.join(args)})\"\nelif d.func.attr == \"extend\":\n- return f\"{find(d.func.value)} = {find(d.func.value)} + {args[0]}\"\n+ array = find(d.func.value)\n+ return f\"{array} = {array} + {args[0]}\"\nelif (\nisinstance(d.func.value, ast.Attribute)\nand isinstance(d.func.value.value, ast.Name)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Change vkscript `extend` convertation (again)
|
718,844 |
10.09.2022 05:54:09
| -10,800 |
4a2cc5688b0b842cc883d1838908d3649ea14aa4
|
Change `isort` configuration
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -103,11 +103,8 @@ line-length = 99\ntarget-version = ['py37', 'py38']\n[tool.isort]\n-force_grid_wrap = 0\n-include_trailing_comma = true\n+profile = \"black\"\nline_length = 99\n-multi_line_output = 3\n-use_parentheses = true\n[build-system]\nbuild-backend = \"poetry.masonry.api\"\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Change `isort` configuration
|
718,844 |
10.09.2022 20:04:28
| -10,800 |
4ce117af9a80297dc97eeed7c37e9a899f883640
|
Update `pyproject.toml` to new `poetry` standart
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -41,7 +41,7 @@ jobs:\n- name: Install dependencies\nif: steps.python-setup.outputs.cache-hit != 'true'\n- run: poetry install\n+ run: poetry install --with dev\n- name: Run flake8\nrun: poetry run flake8\n"
},
{
"change_type": "MODIFY",
"old_path": "poetry.lock",
"new_path": "poetry.lock",
"diff": "@@ -289,20 +289,6 @@ pipfile_deprecated_finder = [\"pipreqs\", \"requirementslib\"]\nplugins = [\"setuptools\"]\nrequirements_deprecated_finder = [\"pip-api\", \"pipreqs\"]\n-[[package]]\n-name = \"lxml\"\n-version = \"4.9.1\"\n-description = \"Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.\"\n-category = \"dev\"\n-optional = false\n-python-versions = \">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*\"\n-\n-[package.extras]\n-cssselect = [\"cssselect (>=0.7)\"]\n-html5 = [\"html5lib\"]\n-htmlsoup = [\"BeautifulSoup4\"]\n-source = [\"Cython (>=0.29.7)\"]\n-\n[[package]]\nname = \"mccabe\"\nversion = \"0.6.1\"\n@@ -684,7 +670,7 @@ testing = [\"func-timeout\", \"jaraco.itertools\", \"pytest (>=6)\", \"pytest-black (>=\n[metadata]\nlock-version = \"1.1\"\npython-versions = \"^3.7.2\"\n-content-hash = \"e42fe49d01bb9fa2f8d3576ce8a0848a4794836abca6b5260f0e88959ccdbe2d\"\n+content-hash = \"c9ebc23b63bca6e5436a33f30f0090062e819d9a3efb73054bd16946c8947ae5\"\n[metadata.files]\naiofiles = [\n@@ -979,78 +965,6 @@ isort = [\n{file = \"isort-5.10.1-py3-none-any.whl\", hash = \"sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7\"},\n{file = \"isort-5.10.1.tar.gz\", hash = \"sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951\"},\n]\n-lxml = [\n- {file = \"lxml-4.9.1-cp27-cp27m-macosx_10_15_x86_64.whl\", hash = \"sha256:98cafc618614d72b02185ac583c6f7796202062c41d2eeecdf07820bad3295ed\"},\n- {file = \"lxml-4.9.1-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl\", hash = \"sha256:c62e8dd9754b7debda0c5ba59d34509c4688f853588d75b53c3791983faa96fc\"},\n- {file = \"lxml-4.9.1-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl\", hash = \"sha256:21fb3d24ab430fc538a96e9fbb9b150029914805d551deeac7d7822f64631dfc\"},\n- {file = \"lxml-4.9.1-cp27-cp27m-win32.whl\", hash = \"sha256:86e92728ef3fc842c50a5cb1d5ba2bc66db7da08a7af53fb3da79e202d1b2cd3\"},\n- {file = \"lxml-4.9.1-cp27-cp27m-win_amd64.whl\", hash = \"sha256:4cfbe42c686f33944e12f45a27d25a492cc0e43e1dc1da5d6a87cbcaf2e95627\"},\n- {file = \"lxml-4.9.1-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl\", hash = \"sha256:dad7b164905d3e534883281c050180afcf1e230c3d4a54e8038aa5cfcf312b84\"},\n- {file = \"lxml-4.9.1-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl\", hash = \"sha256:a614e4afed58c14254e67862456d212c4dcceebab2eaa44d627c2ca04bf86837\"},\n- {file = \"lxml-4.9.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl\", hash = \"sha256:f9ced82717c7ec65a67667bb05865ffe38af0e835cdd78728f1209c8fffe0cad\"},\n- {file = \"lxml-4.9.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl\", hash = \"sha256:d9fc0bf3ff86c17348dfc5d322f627d78273eba545db865c3cd14b3f19e57fa5\"},\n- {file = \"lxml-4.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl\", hash = \"sha256:e5f66bdf0976ec667fc4594d2812a00b07ed14d1b44259d19a41ae3fff99f2b8\"},\n- {file = \"lxml-4.9.1-cp310-cp310-musllinux_1_1_aarch64.whl\", hash = \"sha256:fe17d10b97fdf58155f858606bddb4e037b805a60ae023c009f760d8361a4eb8\"},\n- {file = \"lxml-4.9.1-cp310-cp310-musllinux_1_1_x86_64.whl\", hash = \"sha256:8caf4d16b31961e964c62194ea3e26a0e9561cdf72eecb1781458b67ec83423d\"},\n- {file = \"lxml-4.9.1-cp310-cp310-win32.whl\", hash = \"sha256:4780677767dd52b99f0af1f123bc2c22873d30b474aa0e2fc3fe5e02217687c7\"},\n- {file = \"lxml-4.9.1-cp310-cp310-win_amd64.whl\", hash = \"sha256:b122a188cd292c4d2fcd78d04f863b789ef43aa129b233d7c9004de08693728b\"},\n- {file = \"lxml-4.9.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl\", hash = \"sha256:be9eb06489bc975c38706902cbc6888f39e946b81383abc2838d186f0e8b6a9d\"},\n- {file = \"lxml-4.9.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl\", hash = \"sha256:f1be258c4d3dc609e654a1dc59d37b17d7fef05df912c01fc2e15eb43a9735f3\"},\n- {file = \"lxml-4.9.1-cp311-cp311-musllinux_1_1_x86_64.whl\", hash = \"sha256:927a9dd016d6033bc12e0bf5dee1dde140235fc8d0d51099353c76081c03dc29\"},\n- {file = \"lxml-4.9.1-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl\", hash = \"sha256:9232b09f5efee6a495a99ae6824881940d6447debe272ea400c02e3b68aad85d\"},\n- {file = \"lxml-4.9.1-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl\", hash = \"sha256:04da965dfebb5dac2619cb90fcf93efdb35b3c6994fea58a157a834f2f94b318\"},\n- {file = \"lxml-4.9.1-cp35-cp35m-win32.whl\", hash = \"sha256:4d5bae0a37af799207140652a700f21a85946f107a199bcb06720b13a4f1f0b7\"},\n- {file = \"lxml-4.9.1-cp35-cp35m-win_amd64.whl\", hash = \"sha256:4878e667ebabe9b65e785ac8da4d48886fe81193a84bbe49f12acff8f7a383a4\"},\n- {file = \"lxml-4.9.1-cp36-cp36m-macosx_10_15_x86_64.whl\", hash = \"sha256:1355755b62c28950f9ce123c7a41460ed9743c699905cbe664a5bcc5c9c7c7fb\"},\n- {file = \"lxml-4.9.1-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl\", hash = \"sha256:bcaa1c495ce623966d9fc8a187da80082334236a2a1c7e141763ffaf7a405067\"},\n- {file = \"lxml-4.9.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl\", hash = \"sha256:6eafc048ea3f1b3c136c71a86db393be36b5b3d9c87b1c25204e7d397cee9536\"},\n- {file = \"lxml-4.9.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl\", hash = \"sha256:13c90064b224e10c14dcdf8086688d3f0e612db53766e7478d7754703295c7c8\"},\n- {file = \"lxml-4.9.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl\", hash = \"sha256:206a51077773c6c5d2ce1991327cda719063a47adc02bd703c56a662cdb6c58b\"},\n- {file = \"lxml-4.9.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl\", hash = \"sha256:e8f0c9d65da595cfe91713bc1222af9ecabd37971762cb830dea2fc3b3bb2acf\"},\n- {file = \"lxml-4.9.1-cp36-cp36m-musllinux_1_1_aarch64.whl\", hash = \"sha256:8f0a4d179c9a941eb80c3a63cdb495e539e064f8054230844dcf2fcb812b71d3\"},\n- {file = \"lxml-4.9.1-cp36-cp36m-musllinux_1_1_x86_64.whl\", hash = \"sha256:830c88747dce8a3e7525defa68afd742b4580df6aa2fdd6f0855481e3994d391\"},\n- {file = \"lxml-4.9.1-cp36-cp36m-win32.whl\", hash = \"sha256:1e1cf47774373777936c5aabad489fef7b1c087dcd1f426b621fda9dcc12994e\"},\n- {file = \"lxml-4.9.1-cp36-cp36m-win_amd64.whl\", hash = \"sha256:5974895115737a74a00b321e339b9c3f45c20275d226398ae79ac008d908bff7\"},\n- {file = \"lxml-4.9.1-cp37-cp37m-macosx_10_15_x86_64.whl\", hash = \"sha256:1423631e3d51008871299525b541413c9b6c6423593e89f9c4cfbe8460afc0a2\"},\n- {file = \"lxml-4.9.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl\", hash = \"sha256:2aaf6a0a6465d39b5ca69688fce82d20088c1838534982996ec46633dc7ad6cc\"},\n- {file = \"lxml-4.9.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl\", hash = \"sha256:9f36de4cd0c262dd9927886cc2305aa3f2210db437aa4fed3fb4940b8bf4592c\"},\n- {file = \"lxml-4.9.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl\", hash = \"sha256:ae06c1e4bc60ee076292e582a7512f304abdf6c70db59b56745cca1684f875a4\"},\n- {file = \"lxml-4.9.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl\", hash = \"sha256:57e4d637258703d14171b54203fd6822fda218c6c2658a7d30816b10995f29f3\"},\n- {file = \"lxml-4.9.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl\", hash = \"sha256:6d279033bf614953c3fc4a0aa9ac33a21e8044ca72d4fa8b9273fe75359d5cca\"},\n- {file = \"lxml-4.9.1-cp37-cp37m-musllinux_1_1_aarch64.whl\", hash = \"sha256:a60f90bba4c37962cbf210f0188ecca87daafdf60271f4c6948606e4dabf8785\"},\n- {file = \"lxml-4.9.1-cp37-cp37m-musllinux_1_1_x86_64.whl\", hash = \"sha256:6ca2264f341dd81e41f3fffecec6e446aa2121e0b8d026fb5130e02de1402785\"},\n- {file = \"lxml-4.9.1-cp37-cp37m-win32.whl\", hash = \"sha256:27e590352c76156f50f538dbcebd1925317a0f70540f7dc8c97d2931c595783a\"},\n- {file = \"lxml-4.9.1-cp37-cp37m-win_amd64.whl\", hash = \"sha256:eea5d6443b093e1545ad0210e6cf27f920482bfcf5c77cdc8596aec73523bb7e\"},\n- {file = \"lxml-4.9.1-cp38-cp38-macosx_10_15_x86_64.whl\", hash = \"sha256:f05251bbc2145349b8d0b77c0d4e5f3b228418807b1ee27cefb11f69ed3d233b\"},\n- {file = \"lxml-4.9.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl\", hash = \"sha256:487c8e61d7acc50b8be82bda8c8d21d20e133c3cbf41bd8ad7eb1aaeb3f07c97\"},\n- {file = \"lxml-4.9.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl\", hash = \"sha256:8d1a92d8e90b286d491e5626af53afef2ba04da33e82e30744795c71880eaa21\"},\n- {file = \"lxml-4.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl\", hash = \"sha256:b570da8cd0012f4af9fa76a5635cd31f707473e65a5a335b186069d5c7121ff2\"},\n- {file = \"lxml-4.9.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl\", hash = \"sha256:5ef87fca280fb15342726bd5f980f6faf8b84a5287fcc2d4962ea8af88b35130\"},\n- {file = \"lxml-4.9.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl\", hash = \"sha256:93e414e3206779ef41e5ff2448067213febf260ba747fc65389a3ddaa3fb8715\"},\n- {file = \"lxml-4.9.1-cp38-cp38-musllinux_1_1_aarch64.whl\", hash = \"sha256:6653071f4f9bac46fbc30f3c7838b0e9063ee335908c5d61fb7a4a86c8fd2036\"},\n- {file = \"lxml-4.9.1-cp38-cp38-musllinux_1_1_x86_64.whl\", hash = \"sha256:32a73c53783becdb7eaf75a2a1525ea8e49379fb7248c3eeefb9412123536387\"},\n- {file = \"lxml-4.9.1-cp38-cp38-win32.whl\", hash = \"sha256:1a7c59c6ffd6ef5db362b798f350e24ab2cfa5700d53ac6681918f314a4d3b94\"},\n- {file = \"lxml-4.9.1-cp38-cp38-win_amd64.whl\", hash = \"sha256:1436cf0063bba7888e43f1ba8d58824f085410ea2025befe81150aceb123e345\"},\n- {file = \"lxml-4.9.1-cp39-cp39-macosx_10_15_x86_64.whl\", hash = \"sha256:4beea0f31491bc086991b97517b9683e5cfb369205dac0148ef685ac12a20a67\"},\n- {file = \"lxml-4.9.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl\", hash = \"sha256:41fb58868b816c202e8881fd0f179a4644ce6e7cbbb248ef0283a34b73ec73bb\"},\n- {file = \"lxml-4.9.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl\", hash = \"sha256:bd34f6d1810d9354dc7e35158aa6cc33456be7706df4420819af6ed966e85448\"},\n- {file = \"lxml-4.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl\", hash = \"sha256:edffbe3c510d8f4bf8640e02ca019e48a9b72357318383ca60e3330c23aaffc7\"},\n- {file = \"lxml-4.9.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl\", hash = \"sha256:6d949f53ad4fc7cf02c44d6678e7ff05ec5f5552b235b9e136bd52e9bf730b91\"},\n- {file = \"lxml-4.9.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl\", hash = \"sha256:079b68f197c796e42aa80b1f739f058dcee796dc725cc9a1be0cdb08fc45b000\"},\n- {file = \"lxml-4.9.1-cp39-cp39-musllinux_1_1_aarch64.whl\", hash = \"sha256:9c3a88d20e4fe4a2a4a84bf439a5ac9c9aba400b85244c63a1ab7088f85d9d25\"},\n- {file = \"lxml-4.9.1-cp39-cp39-musllinux_1_1_x86_64.whl\", hash = \"sha256:4e285b5f2bf321fc0857b491b5028c5f276ec0c873b985d58d7748ece1d770dd\"},\n- {file = \"lxml-4.9.1-cp39-cp39-win32.whl\", hash = \"sha256:ef72013e20dd5ba86a8ae1aed7f56f31d3374189aa8b433e7b12ad182c0d2dfb\"},\n- {file = \"lxml-4.9.1-cp39-cp39-win_amd64.whl\", hash = \"sha256:10d2017f9150248563bb579cd0d07c61c58da85c922b780060dcc9a3aa9f432d\"},\n- {file = \"lxml-4.9.1-pp37-pypy37_pp73-macosx_10_15_x86_64.whl\", hash = \"sha256:0538747a9d7827ce3e16a8fdd201a99e661c7dee3c96c885d8ecba3c35d1032c\"},\n- {file = \"lxml-4.9.1-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl\", hash = \"sha256:0645e934e940107e2fdbe7c5b6fb8ec6232444260752598bc4d09511bd056c0b\"},\n- {file = \"lxml-4.9.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl\", hash = \"sha256:6daa662aba22ef3258934105be2dd9afa5bb45748f4f702a3b39a5bf53a1f4dc\"},\n- {file = \"lxml-4.9.1-pp38-pypy38_pp73-macosx_10_15_x86_64.whl\", hash = \"sha256:603a464c2e67d8a546ddaa206d98e3246e5db05594b97db844c2f0a1af37cf5b\"},\n- {file = \"lxml-4.9.1-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl\", hash = \"sha256:c4b2e0559b68455c085fb0f6178e9752c4be3bba104d6e881eb5573b399d1eb2\"},\n- {file = \"lxml-4.9.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl\", hash = \"sha256:0f3f0059891d3254c7b5fb935330d6db38d6519ecd238ca4fce93c234b4a0f73\"},\n- {file = \"lxml-4.9.1-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl\", hash = \"sha256:c852b1530083a620cb0de5f3cd6826f19862bafeaf77586f1aef326e49d95f0c\"},\n- {file = \"lxml-4.9.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl\", hash = \"sha256:287605bede6bd36e930577c5925fcea17cb30453d96a7b4c63c14a257118dbb9\"},\n- {file = \"lxml-4.9.1.tar.gz\", hash = \"sha256:fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f\"},\n-]\nmccabe = [\n{file = \"mccabe-0.6.1-py2.py3-none-any.whl\", hash = \"sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42\"},\n{file = \"mccabe-0.6.1.tar.gz\", hash = \"sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f\"},\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -33,9 +33,11 @@ classifiers = [\n]\nexclude = [\"**/tests/*\", \"**/test_*\"]\n+\n[tool.poetry.urls]\n\"Bug Tracker\" = \"https://github.com/vkbottle/vkbottle/issues\"\n+\n[tool.poetry.dependencies]\npython = \"^3.7.2\"\naiohttp = \"^3.8.1\"\n@@ -47,67 +49,60 @@ watchfiles = \">=0.15,<0.17\"\naiofiles = \">=0.8,<22.2\"\ntyping-extensions = \"^4.3.0\"\n-[tool.poetry.dev-dependencies]\n+\n+[tool.poetry.group.dev]\n+optional = true\n+\n+[tool.poetry.group.dev.dependencies]\n# Lint\nblack = {version = \"^22.8\", allow-prereleases = true}\nflake8 = \"^3.9.2\"\nisort = \"^5.10.1\"\n-lxml = \"^4.9.0\"\nmypy = \"^0.971\"\nmypy-extensions = \"^0.4.3\"\n-\n# mypy stubs\ntypes-aiofiles = \"^22.1.0\"\n-\n# Tests\npytest = \"^7.1.3\"\npytest-asyncio = \"^0.19.0\"\npytest-cov = \"^3.0.0\"\npytest-mock = \"^3.7.0\"\n-\n+# Pre-commit\n+autoflake = \"^1.5\"\n+pre-commit = \"^2.19.0\"\n# Docs\n# Due to a conflict with flake8 (https://github.com/PyCQA/flake8/pull/1438)\n# docs dependencies are now listed in mkdocs-requirements.txt.\n# mkdocs = \"^1.3.1\"\n# mkdocs-material = \"^8.4.3\"\n-# Pre-commit\n-autoflake = \"^1.5\"\n-pre-commit = \"^2.19.0\"\n+[build-system]\n+requires = [\"poetry-core>=1.0.0\"]\n+build-backend = \"poetry.core.masonry.api\"\n+\n[tool.pytest.ini_options]\nasyncio_mode = \"auto\"\n+\n[tool.mypy]\npython_version = 3.8\nignore_missing_imports = true\nwarn_no_return = false\nwarn_return_any = false\nwarn_unused_configs = true\n-# Ignore tests, because we can use fixtures that not quite represent a real type\n+\n[[tool.mypy.overrides]]\n+# Ignore tests, because we can use fixtures that not quite represent a real type\nmodule = \"*.tests.*\"\nignore_errors = true\n+\n[tool.black]\n-force-exclude = '''\n-(\n- \\.eggs\n- | \\.git\n- | \\.tox\n- | build\n- | dist\n- | venv\n- | docs\n-)\n-'''\nline-length = 99\ntarget-version = ['py37', 'py38']\n+\n[tool.isort]\nprofile = \"black\"\nline_length = 99\n-\n-[build-system]\n-build-backend = \"poetry.masonry.api\"\n-requires = [\"poetry>=0.12\"]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Update `pyproject.toml` to new `poetry` standart
|
718,885 |
12.09.2022 20:32:41
| -10,800 |
2aefa1f795d73f76dd110ddd77ce285bd84c4871
|
Fix typing issues when using parameterized `CodeException` in try-except block
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"new_path": "vkbottle/api/response_validator/vk_api_error_validator.py",
"diff": "-from typing import TYPE_CHECKING, Any, Dict, NoReturn, Type, Union\n+from typing import TYPE_CHECKING, Any, NoReturn, Union\nfrom vkbottle.exception_factory import CaptchaError, VKAPIError\nfrom vkbottle.modules import logger\n@@ -9,9 +9,6 @@ if TYPE_CHECKING:\nfrom vkbottle.api import ABCAPI, API\n-SPECIFIC_ERRORS: Dict[int, Type[VKAPIError]] = {14: CaptchaError}\n-\n-\nclass VKAPIErrorResponseValidator(ABCResponseValidator):\n\"\"\"Default vk api error response validator\nDocumentation: https://github.com/vkbottle/vkbottle/blob/master/docs/low-level/api/response-validator.md\n@@ -40,12 +37,11 @@ class VKAPIErrorResponseValidator(ABCResponseValidator):\nreturn None\nerror = response[\"error\"]\ncode = error.pop(\"error_code\")\n- exception = SPECIFIC_ERRORS.get(code, VKAPIError[code])\n- if exception == CaptchaError and ctx_api.captcha_handler:\n- key = await ctx_api.captcha_handler(exception(**error)) # type: ignore\n+ if VKAPIError[code] is CaptchaError and ctx_api.captcha_handler:\n+ key = await ctx_api.captcha_handler(CaptchaError(**error)) # type: ignore\nreturn await ctx_api.request(\nmethod, {**data, \"captcha_sid\": error[\"captcha_sid\"], \"captcha_key\": key}\n)\n- raise exception(**error)\n+ raise VKAPIError[code](**error)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/base_exceptions.py",
"new_path": "vkbottle/exception_factory/base_exceptions.py",
"diff": "-from typing import Any, List\n-\n-from pydantic.validators import int_validator, str_validator\n+from typing import List\nfrom .code_exception import CodeException\nclass VKAPIError(CodeException):\n- def __init__(self, *, error_msg: Any, request_params: List[dict]):\n- super().__init__(error_msg)\n- self.description = str_validator(error_msg)\n+ def __init__(self, *, error_msg: str, request_params: List[dict]):\n+ self.description = error_msg\nself.params = {item[\"key\"]: item[\"value\"] for item in request_params}\n+ def __str__(self) -> str:\n+ return self.description\n+\n-class CaptchaError(VKAPIError[14]): # type: ignore\n- def __init__(self, *, captcha_sid: Any, captcha_img: Any, **kwargs):\n+class CaptchaError(VKAPIError, code=14):\n+ def __init__(self, *, captcha_sid: str, captcha_img: str, **kwargs):\nsuper().__init__(**kwargs)\n- self.sid = int_validator(captcha_sid)\n- self.img = str_validator(captcha_img)\n+ self.sid = int(captcha_sid)\n+ self.img = captcha_img\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/code_exception.py",
"new_path": "vkbottle/exception_factory/code_exception.py",
"diff": "-from typing import Dict, Tuple, Type, TypeVar, Union, cast, no_type_check, overload\n+from typing import Any, Dict, Optional, Tuple, TypeVar, Union, cast, overload\n-T = TypeVar(\"T\", bound=Type[\"CodeException\"])\n+T = TypeVar(\"T\", bound=\"CodeExceptionMeta\")\n-class CodeException(Exception):\n+class CodeExceptionMeta(type):\ncode: int\n- __code_specified__: bool = False\n- __exceptions__: Dict[int, Type[\"CodeException\"]] = {}\n+ __exceptions__: Dict[int, Any]\n+ __code_specified__ = False\n- @no_type_check\n- def __new__(cls, *args, **kwargs):\n+ def __init__(cls, name: str, bases: Tuple[type, ...], attrs: Dict[str, object], *, code: Optional[int] = None):\n+ super().__init__(name, bases, attrs)\n+ if code is None:\n+ cls.__exceptions__ = {}\n+\n+ def __call__(cls, *args: object, **kwargs: object) -> object:\nif not cls.__code_specified__:\nraise TypeError(\"exception code is not specified\")\n-\n- return super().__new__(cls, *args, **kwargs)\n-\n- @no_type_check\n- def __init_subclass__(cls, **kwargs):\n- super().__init_subclass__(**kwargs)\n- cls.__exceptions__ = {}\n+ return super().__call__(*args, **kwargs)\n@overload\n- def __class_getitem__(cls: T, code: int) -> T:\n+ def __getitem__(cls: T, code: int, /) -> Union[T, Any]:\n...\n@overload\n- def __class_getitem__(cls: T, code: Tuple[int, ...]) -> Tuple[T, ...]:\n+ def __getitem__(cls: T, codes: Tuple[int, ...], /) -> Union[Tuple[T, ...], Any]:\n...\n- def __class_getitem__(cls: T, code: Union[int, Tuple[int, ...]]) -> Union[T, Tuple[T, ...]]:\n+ def __getitem__(cls: T, code_or_codes: Union[int, Tuple[int, ...]], /) -> Union[T, Tuple[T], Any]:\nif cls.__code_specified__:\nraise TypeError(\"exception code already specified\")\n+ if isinstance(code_or_codes, tuple):\n+ return tuple(cls._get_exception(code) for code in code_or_codes)\n+ return cls._get_exception(code_or_codes)\n- if isinstance(code, tuple):\n- return tuple(cls._get_exception(c) for c in code)\n-\n- return cls._get_exception(code)\n+ def register_exception(cls: T, exception: T, code: int) -> None:\n+ exception.code = code\n+ exception.__code_specified__ = True\n+ cls.__exceptions__[code] = exception\n- @classmethod\ndef _get_exception(cls: T, code: int) -> T:\n- if code in cls.__exceptions__:\n- return cast(T, cls.__exceptions__[code])\n+ if code not in cls.__exceptions__:\n+ cls._create_exception(code)\n+ return cls.__exceptions__[code]\n- return cls._register_exception(code)\n+ def _create_exception(cls, code: int) -> None:\n+ cls.register_exception(cast(CodeExceptionMeta, type(f\"{cls.__name__}_{code}\", (cast(type, cls),), {})), code)\n- @classmethod\n- def _register_exception(cls: T, code: int) -> T:\n- name = f\"{cls.__name__}_{code}\"\n- exception = cast(T, type(name, (cls,), {})) # type: ignore\n- exception.code = code\n- exception.__code_specified__ = True\n- cls.__exceptions__[code] = exception\n+class CodeException(Exception, metaclass=CodeExceptionMeta):\n+ code: int\n- return exception\n+ def __init_subclass__(cls, code: Optional[int] = None, **kwargs: object) -> None:\n+ if code is not None:\n+ cls.register_exception(cls, code)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix typing issues when using parameterized `CodeException` in try-except block (#564)
|
718,885 |
16.09.2022 13:45:37
| -10,800 |
c333f0652a5694e835ebfff46c957683836aaee4
|
Fix typing issues in `error_handler`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/code_exception.py",
"new_path": "vkbottle/exception_factory/code_exception.py",
"diff": "@@ -8,7 +8,14 @@ class CodeExceptionMeta(type):\n__exceptions__: Dict[int, Any]\n__code_specified__ = False\n- def __init__(cls, name: str, bases: Tuple[type, ...], attrs: Dict[str, object], *, code: Optional[int] = None):\n+ def __init__(\n+ cls,\n+ name: str,\n+ bases: Tuple[type, ...],\n+ attrs: Dict[str, object],\n+ *,\n+ code: Optional[int] = None,\n+ ):\nsuper().__init__(name, bases, attrs)\nif code is None:\ncls.__exceptions__ = {}\n@@ -26,7 +33,11 @@ class CodeExceptionMeta(type):\ndef __getitem__(cls: T, codes: Tuple[int, ...], /) -> Union[Tuple[T, ...], Any]:\n...\n- def __getitem__(cls: T, code_or_codes: Union[int, Tuple[int, ...]], /) -> Union[T, Tuple[T], Any]:\n+ def __getitem__(\n+ cls: T,\n+ code_or_codes: Union[int, Tuple[int, ...]],\n+ /,\n+ ) -> Union[T, Tuple[T], Any]:\nif cls.__code_specified__:\nraise TypeError(\"exception code already specified\")\nif isinstance(code_or_codes, tuple):\n@@ -44,7 +55,9 @@ class CodeExceptionMeta(type):\nreturn cls.__exceptions__[code]\ndef _create_exception(cls, code: int) -> None:\n- cls.register_exception(cast(CodeExceptionMeta, type(f\"{cls.__name__}_{code}\", (cast(type, cls),), {})), code)\n+ cls.register_exception(\n+ cast(CodeExceptionMeta, type(f\"{cls.__name__}_{code}\", (cast(type, cls),), {})), code\n+ )\nclass CodeException(Exception, metaclass=CodeExceptionMeta):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/abc.py",
"new_path": "vkbottle/exception_factory/error_handler/abc.py",
"diff": "from abc import ABC, abstractmethod\n-from typing import Any, Awaitable, Callable, Dict, Optional, Type\n+from typing import Any, Awaitable, Callable, Coroutine, Dict, Optional, Type, TypeVar\n-AsyncFunc = Callable[..., Awaitable[Any]]\n+from typing_extensions import ParamSpec\n+\n+P = ParamSpec(\"P\")\n+\n+T = TypeVar(\"T\")\n+T_AsyncFunc = TypeVar(\"T_AsyncFunc\", bound=Callable[..., Awaitable[object]])\nclass ABCErrorHandler(ABC):\n- error_handlers: Dict[Type[Exception], AsyncFunc]\n- undefined_error_handler: Optional[AsyncFunc]\n+ error_handlers: Dict[Type[Exception], Callable[..., Awaitable[Any]]]\n+ undefined_error_handler: Optional[Callable[..., Awaitable[Any]]]\n@abstractmethod\ndef register_error_handler(\nself, *error_types: Type[Exception]\n- ) -> Callable[[AsyncFunc], AsyncFunc]:\n+ ) -> Callable[[T_AsyncFunc], T_AsyncFunc]:\npass\n@abstractmethod\n- def register_undefined_error_handler(self, handler: AsyncFunc) -> AsyncFunc:\n+ def register_undefined_error_handler(self, handler: T_AsyncFunc) -> T_AsyncFunc:\npass\n@abstractmethod\n@@ -23,5 +28,5 @@ class ABCErrorHandler(ABC):\npass\n@abstractmethod\n- def catch(self, func: AsyncFunc) -> AsyncFunc:\n+ def catch(self, func: Callable[P, Awaitable[T]]) -> Callable[P, Coroutine[Any, Any, T]]:\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/error_handler/error_handler.py",
"new_path": "vkbottle/exception_factory/error_handler/error_handler.py",
"diff": "from functools import wraps\n-from typing import TYPE_CHECKING, Any, Callable, Optional, Type\n+from typing import Any, Awaitable, Callable, Coroutine, Optional, Type, TypeVar\n-from .abc import ABCErrorHandler\n+from typing_extensions import ParamSpec\n-if TYPE_CHECKING:\n- from .abc import AsyncFunc\nfrom vkbottle.modules import logger\n+from .abc import ABCErrorHandler\n+\n+P = ParamSpec(\"P\")\n+\n+T = TypeVar(\"T\")\n+T_AsyncFunc = TypeVar(\"T_AsyncFunc\", bound=Callable[..., Awaitable[object]])\n+\nclass ErrorHandler(ABCErrorHandler):\ndef __init__(self, redirect_arguments: bool = False, raise_exceptions: bool = False):\n@@ -17,19 +22,19 @@ class ErrorHandler(ABCErrorHandler):\ndef register_error_handler(\nself, *error_types: Type[Exception]\n- ) -> Callable[[\"AsyncFunc\"], \"AsyncFunc\"]:\n- def decorator(handler: \"AsyncFunc\") -> \"AsyncFunc\":\n+ ) -> Callable[[T_AsyncFunc], T_AsyncFunc]:\n+ def decorator(handler: T_AsyncFunc) -> T_AsyncFunc:\nfor error_type in error_types:\nself.error_handlers[error_type] = handler\nreturn handler\nreturn decorator\n- def register_undefined_error_handler(self, handler: \"AsyncFunc\") -> \"AsyncFunc\":\n+ def register_undefined_error_handler(self, handler: T_AsyncFunc) -> T_AsyncFunc:\nself.undefined_error_handler = handler\nreturn handler\n- def lookup_handler(self, for_type: Type[Exception]) -> Optional[\"AsyncFunc\"]:\n+ def lookup_handler(self, for_type: Type[Exception]) -> Optional[Callable[..., Awaitable[Any]]]:\nfor error_type in self.error_handlers:\nif issubclass(for_type, error_type):\nreturn self.error_handlers[error_type]\n@@ -47,11 +52,11 @@ class ErrorHandler(ABCErrorHandler):\nreturn await handler(error, *args, **kwargs)\nreturn await handler(error)\n- def catch(self, func: \"AsyncFunc\") -> \"AsyncFunc\":\n+ def catch(self, func: Callable[P, Awaitable[T]]) -> Callable[P, Coroutine[Any, Any, T]]:\n@wraps(func)\n- async def wrapper(*args, **kwargs) -> Any:\n+ async def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:\ntry:\n- await func(*args, **kwargs)\n+ return await func(*args, **kwargs)\nexcept Exception as error:\nreturn await self.handle(error, *args, **kwargs)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix typing issues in `error_handler` (#566)
|
718,844 |
10.09.2022 21:51:46
| -10,800 |
ec64188206079d4227a13880a0f7fdabc73e8afb
|
Replace `flake8` with `flakeheaven`
|
[
{
"change_type": "DELETE",
"old_path": ".flake8",
"new_path": null,
"diff": "-[flake8]\n-max-line-length = 99\n-ignore = F405, F403, W503, E501, E203\n-exclude = .git, build, dist, venv, .venv, docs, examples, tests, *.egg-info\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -43,8 +43,8 @@ jobs:\nif: steps.python-setup.outputs.cache-hit != 'true'\nrun: poetry install --with dev\n- - name: Run flake8\n- run: poetry run flake8\n+ - name: Run flakeheaven\n+ run: poetry run flakeheaven lint\n- name: Run mypy\nrun: poetry run mypy vkbottle\n"
},
{
"change_type": "MODIFY",
"old_path": ".pre-commit-config.yaml",
"new_path": ".pre-commit-config.yaml",
"diff": "@@ -51,9 +51,9 @@ repos:\npass_filenames: false\nstages: [ push ]\n- - id: flake8\n- name: flake8 check\n- entry: poetry run flake8\n+ - id: flakeheaven\n+ name: flakeheaven check\n+ entry: poetry run flakeheaven lint\nlanguage: system\ntypes: [ python ]\nstages: [ push ]\n"
},
{
"change_type": "MODIFY",
"old_path": "poetry.lock",
"new_path": "poetry.lock",
"diff": "@@ -197,6 +197,14 @@ category = \"dev\"\noptional = false\npython-versions = \"*\"\n+[[package]]\n+name = \"entrypoints\"\n+version = \"0.4\"\n+description = \"Discover and load entry points from installed packages.\"\n+category = \"dev\"\n+optional = false\n+python-versions = \">=3.6\"\n+\n[[package]]\nname = \"filelock\"\nversion = \"3.8.0\"\n@@ -211,17 +219,37 @@ testing = [\"covdefaults (>=2.2)\", \"coverage (>=6.4.2)\", \"pytest (>=7.1.2)\", \"pyt\n[[package]]\nname = \"flake8\"\n-version = \"3.9.2\"\n+version = \"4.0.1\"\ndescription = \"the modular source code checker: pep8 pyflakes and co\"\ncategory = \"dev\"\noptional = false\n-python-versions = \"!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7\"\n+python-versions = \">=3.6\"\n[package.dependencies]\n-importlib-metadata = {version = \"*\", markers = \"python_version < \\\"3.8\\\"\"}\n+importlib-metadata = {version = \"<4.3\", markers = \"python_version < \\\"3.8\\\"\"}\nmccabe = \">=0.6.0,<0.7.0\"\n-pycodestyle = \">=2.7.0,<2.8.0\"\n-pyflakes = \">=2.3.0,<2.4.0\"\n+pycodestyle = \">=2.8.0,<2.9.0\"\n+pyflakes = \">=2.4.0,<2.5.0\"\n+\n+[[package]]\n+name = \"flakeheaven\"\n+version = \"3.0.0\"\n+description = \"FlakeHeaven is a [Flake8](https://gitlab.com/pycqa/flake8) wrapper to make it cool.\"\n+category = \"dev\"\n+optional = false\n+python-versions = \">=3.7,<4.0\"\n+\n+[package.dependencies]\n+colorama = \"*\"\n+entrypoints = \"*\"\n+flake8 = \">=4.0.1,<5.0.0\"\n+importlib-metadata = {version = \">=1.0\", markers = \"python_version < \\\"3.8\\\"\"}\n+pygments = \"*\"\n+toml = \"*\"\n+urllib3 = \"*\"\n+\n+[package.extras]\n+docs = [\"alabaster\", \"myst-parser (>=0.18.0,<0.19.0)\", \"pygments-github-lexers\", \"sphinx\"]\n[[package]]\nname = \"frozenlist\"\n@@ -252,20 +280,19 @@ python-versions = \">=3.5\"\n[[package]]\nname = \"importlib-metadata\"\n-version = \"4.12.0\"\n+version = \"4.2.0\"\ndescription = \"Read metadata from Python packages\"\ncategory = \"dev\"\noptional = false\n-python-versions = \">=3.7\"\n+python-versions = \">=3.6\"\n[package.dependencies]\ntyping-extensions = {version = \">=3.6.4\", markers = \"python_version < \\\"3.8\\\"\"}\nzipp = \">=0.5\"\n[package.extras]\n-docs = [\"jaraco.packaging (>=9)\", \"rst.linker (>=1.9)\", \"sphinx\"]\n-perf = [\"ipython\"]\n-testing = [\"flufl.flake8\", \"importlib-resources (>=1.3)\", \"packaging\", \"pyfakefs\", \"pytest (>=6)\", \"pytest-black (>=0.3.7)\", \"pytest-checkdocs (>=2.4)\", \"pytest-cov\", \"pytest-enabler (>=1.3)\", \"pytest-flake8\", \"pytest-mypy (>=0.9.1)\", \"pytest-perf (>=0.9.2)\"]\n+docs = [\"jaraco.packaging (>=8.2)\", \"rst.linker (>=1.9)\", \"sphinx\"]\n+testing = [\"flufl.flake8\", \"importlib-resources (>=1.3)\", \"packaging\", \"pep517\", \"pyfakefs\", \"pytest (>=4.6)\", \"pytest-black (>=0.3.7)\", \"pytest-checkdocs (>=2.4)\", \"pytest-cov\", \"pytest-enabler (>=1.0.1)\", \"pytest-flake8\", \"pytest-mypy\"]\n[[package]]\nname = \"iniconfig\"\n@@ -416,11 +443,11 @@ python-versions = \">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*\"\n[[package]]\nname = \"pycodestyle\"\n-version = \"2.7.0\"\n+version = \"2.8.0\"\ndescription = \"Python style guide checker\"\ncategory = \"dev\"\noptional = false\n-python-versions = \">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*\"\n+python-versions = \">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*\"\n[[package]]\nname = \"pydantic\"\n@@ -439,12 +466,23 @@ email = [\"email-validator (>=1.0.3)\"]\n[[package]]\nname = \"pyflakes\"\n-version = \"2.3.1\"\n+version = \"2.4.0\"\ndescription = \"passive checker of Python programs\"\ncategory = \"dev\"\noptional = false\npython-versions = \">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*\"\n+[[package]]\n+name = \"Pygments\"\n+version = \"2.13.0\"\n+description = \"Pygments is a syntax highlighting package written in Python.\"\n+category = \"dev\"\n+optional = false\n+python-versions = \">=3.6\"\n+\n+[package.extras]\n+plugins = [\"importlib-metadata\"]\n+\n[[package]]\nname = \"pyparsing\"\nversion = \"3.0.9\"\n@@ -590,6 +628,19 @@ category = \"main\"\noptional = false\npython-versions = \">=3.7\"\n+[[package]]\n+name = \"urllib3\"\n+version = \"1.26.12\"\n+description = \"HTTP library with thread-safe connection pooling, file post, and more.\"\n+category = \"dev\"\n+optional = false\n+python-versions = \">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4\"\n+\n+[package.extras]\n+brotli = [\"brotli (>=1.0.9)\", \"brotlicffi (>=0.8.0)\", \"brotlipy (>=0.6.0)\"]\n+secure = [\"certifi\", \"cryptography (>=1.3.4)\", \"idna (>=2.0.0)\", \"ipaddress\", \"pyOpenSSL (>=0.14)\", \"urllib3-secure-extra\"]\n+socks = [\"PySocks (>=1.5.6,!=1.5.7,<2.0)\"]\n+\n[[package]]\nname = \"vbml\"\nversion = \"1.1.post1\"\n@@ -603,21 +654,21 @@ typing_extensions = \"*\"\n[[package]]\nname = \"virtualenv\"\n-version = \"20.16.5\"\n+version = \"20.16.2\"\ndescription = \"Virtual Python Environment builder\"\ncategory = \"dev\"\noptional = false\npython-versions = \">=3.6\"\n[package.dependencies]\n-distlib = \">=0.3.5,<1\"\n-filelock = \">=3.4.1,<4\"\n-importlib-metadata = {version = \">=4.8.3\", markers = \"python_version < \\\"3.8\\\"\"}\n-platformdirs = \">=2.4,<3\"\n+distlib = \">=0.3.1,<1\"\n+filelock = \">=3.2,<4\"\n+importlib-metadata = {version = \">=0.12\", markers = \"python_version < \\\"3.8\\\"\"}\n+platformdirs = \">=2,<3\"\n[package.extras]\n-docs = [\"proselint (>=0.13)\", \"sphinx (>=5.1.1)\", \"sphinx-argparse (>=0.3.1)\", \"sphinx-rtd-theme (>=1)\", \"towncrier (>=21.9)\"]\n-testing = [\"coverage (>=6.2)\", \"coverage-enable-subprocess (>=1)\", \"flaky (>=3.7)\", \"packaging (>=21.3)\", \"pytest (>=7.0.1)\", \"pytest-env (>=0.6.2)\", \"pytest-freezegun (>=0.4.2)\", \"pytest-mock (>=3.6.1)\", \"pytest-randomly (>=3.10.3)\", \"pytest-timeout (>=2.1)\"]\n+docs = [\"proselint (>=0.10.2)\", \"sphinx (>=3)\", \"sphinx-argparse (>=0.2.5)\", \"sphinx-rtd-theme (>=0.4.3)\", \"towncrier (>=21.3)\"]\n+testing = [\"coverage (>=4)\", \"coverage-enable-subprocess (>=1)\", \"flaky (>=3)\", \"packaging (>=20.0)\", \"pytest (>=4)\", \"pytest-env (>=0.6.2)\", \"pytest-freezegun (>=0.4.1)\", \"pytest-mock (>=2)\", \"pytest-randomly (>=1)\", \"pytest-timeout (>=1)\"]\n[[package]]\nname = \"vkbottle-types\"\n@@ -876,13 +927,21 @@ distlib = [\n{file = \"distlib-0.3.6-py2.py3-none-any.whl\", hash = \"sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e\"},\n{file = \"distlib-0.3.6.tar.gz\", hash = \"sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46\"},\n]\n+entrypoints = [\n+ {file = \"entrypoints-0.4-py3-none-any.whl\", hash = \"sha256:f174b5ff827504fd3cd97cc3f8649f3693f51538c7e4bdf3ef002c8429d42f9f\"},\n+ {file = \"entrypoints-0.4.tar.gz\", hash = \"sha256:b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4\"},\n+]\nfilelock = [\n{file = \"filelock-3.8.0-py3-none-any.whl\", hash = \"sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4\"},\n{file = \"filelock-3.8.0.tar.gz\", hash = \"sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc\"},\n]\nflake8 = [\n- {file = \"flake8-3.9.2-py2.py3-none-any.whl\", hash = \"sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907\"},\n- {file = \"flake8-3.9.2.tar.gz\", hash = \"sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b\"},\n+ {file = \"flake8-4.0.1-py2.py3-none-any.whl\", hash = \"sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d\"},\n+ {file = \"flake8-4.0.1.tar.gz\", hash = \"sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d\"},\n+]\n+flakeheaven = [\n+ {file = \"flakeheaven-3.0.0-py3-none-any.whl\", hash = \"sha256:c3e8acbbb3ca29402132cc160857c4f9ed6051a37f9d4d4f424ea6d14616ea33\"},\n+ {file = \"flakeheaven-3.0.0.tar.gz\", hash = \"sha256:81771740b2de3151d9cf6a38b63bc0f30b1070a15ddd2acf1c1706271d9dc0dd\"},\n]\nfrozenlist = [\n{file = \"frozenlist-1.3.1-cp310-cp310-macosx_10_9_universal2.whl\", hash = \"sha256:5f271c93f001748fc26ddea409241312a75e13466b06c94798d1a341cf0e6989\"},\n@@ -954,8 +1013,8 @@ idna = [\n{file = \"idna-3.3.tar.gz\", hash = \"sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d\"},\n]\nimportlib-metadata = [\n- {file = \"importlib_metadata-4.12.0-py3-none-any.whl\", hash = \"sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23\"},\n- {file = \"importlib_metadata-4.12.0.tar.gz\", hash = \"sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670\"},\n+ {file = \"importlib_metadata-4.2.0-py3-none-any.whl\", hash = \"sha256:057e92c15bc8d9e8109738a48db0ccb31b4d9d5cfbee5a8670879a30be66304b\"},\n+ {file = \"importlib_metadata-4.2.0.tar.gz\", hash = \"sha256:b7e52a1f8dec14a75ea73e0891f3060099ca1d8e6a462a4dff11c3e119ea1b31\"},\n]\niniconfig = [\n{file = \"iniconfig-1.1.1-py2.py3-none-any.whl\", hash = \"sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3\"},\n@@ -1088,8 +1147,8 @@ py = [\n{file = \"py-1.11.0.tar.gz\", hash = \"sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719\"},\n]\npycodestyle = [\n- {file = \"pycodestyle-2.7.0-py2.py3-none-any.whl\", hash = \"sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068\"},\n- {file = \"pycodestyle-2.7.0.tar.gz\", hash = \"sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef\"},\n+ {file = \"pycodestyle-2.8.0-py2.py3-none-any.whl\", hash = \"sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20\"},\n+ {file = \"pycodestyle-2.8.0.tar.gz\", hash = \"sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f\"},\n]\npydantic = [\n{file = \"pydantic-1.10.2-cp310-cp310-macosx_10_9_x86_64.whl\", hash = \"sha256:bb6ad4489af1bac6955d38ebcb95079a836af31e4c4f74aba1ca05bb9f6027bd\"},\n@@ -1130,8 +1189,12 @@ pydantic = [\n{file = \"pydantic-1.10.2.tar.gz\", hash = \"sha256:91b8e218852ef6007c2b98cd861601c6a09f1aa32bbbb74fab5b1c33d4a1e410\"},\n]\npyflakes = [\n- {file = \"pyflakes-2.3.1-py2.py3-none-any.whl\", hash = \"sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3\"},\n- {file = \"pyflakes-2.3.1.tar.gz\", hash = \"sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db\"},\n+ {file = \"pyflakes-2.4.0-py2.py3-none-any.whl\", hash = \"sha256:3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e\"},\n+ {file = \"pyflakes-2.4.0.tar.gz\", hash = \"sha256:05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c\"},\n+]\n+Pygments = [\n+ {file = \"Pygments-2.13.0-py3-none-any.whl\", hash = \"sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42\"},\n+ {file = \"Pygments-2.13.0.tar.gz\", hash = \"sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1\"},\n]\npyparsing = [\n{file = \"pyparsing-3.0.9-py3-none-any.whl\", hash = \"sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc\"},\n@@ -1238,13 +1301,17 @@ typing-extensions = [\n{file = \"typing_extensions-4.3.0-py3-none-any.whl\", hash = \"sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02\"},\n{file = \"typing_extensions-4.3.0.tar.gz\", hash = \"sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6\"},\n]\n+urllib3 = [\n+ {file = \"urllib3-1.26.12-py2.py3-none-any.whl\", hash = \"sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997\"},\n+ {file = \"urllib3-1.26.12.tar.gz\", hash = \"sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e\"},\n+]\nvbml = [\n{file = \"vbml-1.1.post1-py3-none-any.whl\", hash = \"sha256:e3037c3f67b79128c48a100326fde833345e7d1e0d466566d37c2c98d08a587d\"},\n{file = \"vbml-1.1.post1.tar.gz\", hash = \"sha256:59e852b35b2c4d3f8e7d927ab2e0a9dde753f3427ab9a61aca7ed2f4d3986f3c\"},\n]\nvirtualenv = [\n- {file = \"virtualenv-20.16.5-py3-none-any.whl\", hash = \"sha256:d07dfc5df5e4e0dbc92862350ad87a36ed505b978f6c39609dc489eadd5b0d27\"},\n- {file = \"virtualenv-20.16.5.tar.gz\", hash = \"sha256:227ea1b9994fdc5ea31977ba3383ef296d7472ea85be9d6732e42a91c04e80da\"},\n+ {file = \"virtualenv-20.16.2-py2.py3-none-any.whl\", hash = \"sha256:635b272a8e2f77cb051946f46c60a54ace3cb5e25568228bd6b57fc70eca9ff3\"},\n+ {file = \"virtualenv-20.16.2.tar.gz\", hash = \"sha256:0ef5be6d07181946891f5abc8047fda8bc2f0b4b9bf222c64e6e8963baee76db\"},\n]\nvkbottle-types = [\n{file = \"vkbottle-types-5.131.146.11.tar.gz\", hash = \"sha256:433842edaacb38b3b44e5113311289b2b16a252220ca7d725b60df8737ddca4f\"},\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -55,13 +55,15 @@ optional = true\n[tool.poetry.group.dev.dependencies]\n# Lint\n-black = {version = \"^22.8\", allow-prereleases = true}\n-flake8 = \"^3.9.2\"\n+black = \"^22.8.0\"\nisort = \"^5.10.1\"\nmypy = \"^0.971\"\nmypy-extensions = \"^0.4.3\"\n# mypy stubs\ntypes-aiofiles = \"^22.1.0\"\n+# flake8 and it's plugins\n+flake8 = \"^4.0.1\"\n+flakeheaven = \"^3.0.0\" # wrapper for flake8 with better plugin management\n# Tests\npytest = \"^7.1.3\"\npytest-asyncio = \"^0.19.0\"\n@@ -100,9 +102,37 @@ ignore_errors = true\n[tool.black]\nline-length = 99\n-target-version = ['py37', 'py38']\n+target-version = ['py37']\n[tool.isort]\nprofile = \"black\"\nline_length = 99\n+\n+\n+[tool.flakeheaven]\n+max_line_length = 99\n+exclude = [\n+ \".git\",\n+ \"build\",\n+ \"dist\",\n+ \"venv\",\n+ \".venv\",\n+ \"docs\",\n+ \"examples\",\n+ \"tests\",\n+ \"*.egg-info\",\n+ \"*.md\",\n+]\n+\n+[tool.flakeheaven.plugins]\n+\"flake8-*\" = [\"+*\"]\n+pycodestyle = [\n+ \"+*\",\n+ \"-E203\", # whitespace before ':' (black)\n+ \"-E501\", # line too long\n+ \"-W503\", # line break before binary operator (black)\n+]\n+pylint = [\"+*\"]\n+pyflakes = [\"+*\"]\n+mccabe = [\"+*\"]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Replace `flake8` with `flakeheaven`
|
718,844 |
11.09.2022 00:05:27
| -10,800 |
c7b5b9ae944dbcf714ceef0a76e4f210647004aa
|
Add `flake8-bugbear`; Fix it's errors
|
[
{
"change_type": "MODIFY",
"old_path": ".pre-commit-config.yaml",
"new_path": ".pre-commit-config.yaml",
"diff": "@@ -15,7 +15,7 @@ repos:\nhooks:\n- id: autoflake\nname: autoflake\n- entry: bash -c 'make autoflake_fix filename=$@' --\n+ entry: autoflake -i --remove-all-unused-imports\nlanguage: system\ntypes: [ python ]\nstages: [ commit ]\n"
},
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -11,7 +11,7 @@ help:\n# Use poetry or activated venv\ninterpreter := $(shell poetry env info --path > /dev/null 2>&1 && echo \"poetry run\")\n-extract_ignores = $(shell awk '/.*.py/{split($$1,a,\":\"); print a[1]}' .flake8 | tr '\\n' ',')\n+# extract_ignores = $(shell awk '/.*.py/{split($$1,a,\":\"); print a[1]}' .flake8 | tr '\\n' ',')\ncheck-venv:\n@@ -24,16 +24,16 @@ venv: ## Create virtual environment and install all dependencies\nvenv-no-dev: ## Create virtual environment and install only prod dependencies\n@python3 -m pip install poetry\n- @poetry install --no-dev && \\\n+ @poetry install --without dev && \\\necho; echo \"Poetry created virtual environment and installed only prod dependencies\"\ngithooks: check-venv ## Install git hooks\n@$(interpreter) pre-commit install -t=pre-commit -t=pre-push\ncheck: check-venv ## Run tests and linters\n- @echo \"flake8\"\n+ @echo \"flakeheaven\"\n@echo \"======\"\n- @$(interpreter) flake8\n+ @$(interpreter) flakeheaven lint\n@echo ; echo \"black\"\n@echo \"=====\"\n@$(interpreter) black --check .\n@@ -48,12 +48,12 @@ check: check-venv ## Run tests and linters\n@$(interpreter) pytest --cov vkbottle vkbottle\nautoflake_fix:\n- @$(interpreter) autoflake -i --remove-all-unused-imports --exclude $(extract_ignores) $(filename)\n+ @$(interpreter) autoflake -i --remove-all-unused-imports $(filename)\nfix: check-venv ## Fix code with black and autoflake\n@echo \"autoflake\"\n@echo \"=========\"\n- @$(interpreter) autoflake -ri --remove-all-unused-imports --exclude $(extract_ignores) .\n+ @$(interpreter) autoflake -ri --remove-all-unused-imports .\n@echo \"black\"\n@echo \"=====\"\n@$(interpreter) black .\n@@ -67,4 +67,4 @@ publish: ## Publish to PyPi using PYPI_TOKEN\n@# \"; true\" is used to ignore command exit code so that rm -rf can execute anyway\npoetry publish; true\nrm -rf dist/\n- extract_ignores=$(shell echo \"$$(grep ':F401' .flake8 | sed -n 's/\\s*\\(\\S*\\):F401/\\1,/p' | tr '\\n' '\\0')\")\n+# extract_ignores=$(shell echo \"$$(grep ':F401' .flake8 | sed -n 's/\\s*\\(\\S*\\):F401/\\1,/p' | tr '\\n' '\\0')\")\n"
},
{
"change_type": "MODIFY",
"old_path": "poetry.lock",
"new_path": "poetry.lock",
"diff": "@@ -231,6 +231,21 @@ mccabe = \">=0.6.0,<0.7.0\"\npycodestyle = \">=2.8.0,<2.9.0\"\npyflakes = \">=2.4.0,<2.5.0\"\n+[[package]]\n+name = \"flake8-bugbear\"\n+version = \"22.8.23\"\n+description = \"A plugin for flake8 finding likely bugs and design problems in your program. Contains warnings that don't belong in pyflakes and pycodestyle.\"\n+category = \"dev\"\n+optional = false\n+python-versions = \">=3.6\"\n+\n+[package.dependencies]\n+attrs = \">=19.2.0\"\n+flake8 = \">=3.0.0\"\n+\n+[package.extras]\n+dev = [\"coverage\", \"hypothesis\", \"hypothesmith (>=0.2)\", \"pre-commit\"]\n+\n[[package]]\nname = \"flakeheaven\"\nversion = \"3.0.0\"\n@@ -939,6 +954,10 @@ flake8 = [\n{file = \"flake8-4.0.1-py2.py3-none-any.whl\", hash = \"sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d\"},\n{file = \"flake8-4.0.1.tar.gz\", hash = \"sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d\"},\n]\n+flake8-bugbear = [\n+ {file = \"flake8-bugbear-22.8.23.tar.gz\", hash = \"sha256:de0717d11124a082118dd08387b34fd86b2721642ec2d8e92be66cfa5ea7c445\"},\n+ {file = \"flake8_bugbear-22.8.23-py3-none-any.whl\", hash = \"sha256:1b0ebe0873d1cd55bf9f1588bfcb930db339018ef44a3981a26532daa9fd14a8\"},\n+]\nflakeheaven = [\n{file = \"flakeheaven-3.0.0-py3-none-any.whl\", hash = \"sha256:c3e8acbbb3ca29402132cc160857c4f9ed6051a37f9d4d4f424ea6d14616ea33\"},\n{file = \"flakeheaven-3.0.0.tar.gz\", hash = \"sha256:81771740b2de3151d9cf6a38b63bc0f30b1070a15ddd2acf1c1706271d9dc0dd\"},\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -50,9 +50,6 @@ aiofiles = \">=0.8,<22.2\"\ntyping-extensions = \"^4.3.0\"\n-[tool.poetry.group.dev]\n-optional = true\n-\n[tool.poetry.group.dev.dependencies]\n# Lint\nblack = \"^22.8.0\"\n@@ -64,6 +61,7 @@ types-aiofiles = \"^22.1.0\"\n# flake8 and it's plugins\nflake8 = \"^4.0.1\"\nflakeheaven = \"^3.0.0\" # wrapper for flake8 with better plugin management\n+flake8-bugbear = \"^22.8.23\"\n# Tests\npytest = \"^7.1.3\"\npytest-asyncio = \"^0.19.0\"\n@@ -111,7 +109,7 @@ line_length = 99\n[tool.flakeheaven]\n-max_line_length = 99\n+max-line-length = 99\nexclude = [\n\".git\",\n\"build\",\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/middlewares/abc.py",
"new_path": "vkbottle/dispatch/middlewares/abc.py",
"diff": "-from abc import ABC\n+from abc import ABC, abstractmethod\nfrom typing import TYPE_CHECKING, Any, Generic, List, NoReturn, Optional, TypeVar\nif TYPE_CHECKING:\n@@ -13,7 +13,28 @@ class MiddlewareError(Exception):\npass\n-class BaseMiddleware(ABC, Generic[T]):\n+class ABCMiddleware(ABC):\n+ @abstractmethod\n+ def stop(self, description: Any = \"\") -> NoReturn:\n+ ...\n+\n+ @abstractmethod\n+ def send(self, context_update: Optional[dict] = None) -> None:\n+ ...\n+\n+ @abstractmethod\n+ async def pre(self) -> None:\n+ ...\n+\n+ @abstractmethod\n+ async def post(self) -> None:\n+ ...\n+\n+ def __repr__(self) -> str:\n+ return f\"<{self.__class__.__name__}>\"\n+\n+\n+class BaseMiddleware(Generic[T]):\nevent: T\nview: Optional[\"ABCView\"]\nhandle_responses: List\n@@ -76,6 +97,3 @@ class BaseMiddleware(ABC, Generic[T]):\nasync def post(self) -> None:\n...\n-\n- def __repr__(self) -> str:\n- return f\"<{self.__class__.__name__}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/return_manager/abc.py",
"new_path": "vkbottle/dispatch/return_manager/abc.py",
"diff": "-from abc import ABC\n+from abc import ABC, abstractmethod, abstractproperty\nfrom typing import Any, Callable, Coroutine, Dict, NamedTuple, Optional, Tuple, Union\nHandlerProperty = NamedTuple(\n@@ -6,7 +6,26 @@ HandlerProperty = NamedTuple(\n)\n-class BaseReturnManager(ABC):\n+# TODO: fix types here\n+class ABCRetunManager(ABC):\n+ @abstractmethod\n+ def get_handler(self, value: Any) -> Any:\n+ ...\n+\n+ @abstractproperty\n+ def handlers(self) -> Any:\n+ ...\n+\n+ @classmethod\n+ @abstractmethod\n+ def instance_of(cls, types: Any) -> Any:\n+ ...\n+\n+ def __repr__(self) -> str:\n+ return f\"<{self.__class__.__name__}>\"\n+\n+\n+class BaseReturnManager(ABCRetunManager):\ndef get_handler(self, value: Any) -> Optional[Callable]:\nfor types, handler in self.handlers.items():\nif isinstance(value, types):\n@@ -28,6 +47,3 @@ class BaseReturnManager(ABC):\nreturn HandlerProperty(types, func)\nreturn decorator\n-\n- def __repr__(self) -> str:\n- return f\"<{self.__class__.__name__}>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/abc/raw.py",
"new_path": "vkbottle/dispatch/views/abc/raw.py",
"diff": "@@ -48,7 +48,7 @@ class ABCRawEventView(ABCView[T_contra], Generic[T_contra]):\nif isinstance(event_model, dict):\nevent_model[\"ctx_api\"] = ctx_api\nelse:\n- setattr(event_model, \"unprepared_ctx_api\", ctx_api)\n+ event_model.unprepared_ctx_api = ctx_api # type: ignore\nresult = await handler_basement.handler.filter(event_model)\nlogger.debug(\"Handler {} returned {}\", handler_basement.handler, result)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "-from abc import ABC\nfrom typing import TYPE_CHECKING, Generic, Optional, TypeVar\nfrom vkbottle_types.events import GroupEventType\n@@ -14,7 +13,7 @@ if TYPE_CHECKING:\nT_contra = TypeVar(\"T_contra\", contravariant=True)\n-class ABCBotMessageView(ABCMessageView[dict, T_contra], ABC, Generic[T_contra]):\n+class ABCBotMessageView(ABCMessageView[dict, T_contra], Generic[T_contra]):\ndef __init__(self):\nsuper().__init__()\nself.handler_return_manager = BotMessageReturnHandler()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/message.py",
"new_path": "vkbottle/dispatch/views/user/message.py",
"diff": "-from abc import ABC\nfrom typing import TYPE_CHECKING, Generic, Optional, TypeVar\nfrom vkbottle_types.events import UserEventType\n@@ -14,7 +13,7 @@ if TYPE_CHECKING:\nT_contra = TypeVar(\"T_contra\", contravariant=True)\n-class ABCUserMessageView(ABCMessageView[list, T_contra], ABC, Generic[T_contra]):\n+class ABCUserMessageView(ABCMessageView[list, T_contra], Generic[T_contra]):\ndef __init__(self):\nsuper().__init__()\nself.handler_return_manager = UserMessageReturnHandler()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/keyboard/action.py",
"new_path": "vkbottle/tools/dev/keyboard/action.py",
"diff": "-from abc import ABC\nfrom typing import Optional, Union\nPayload = Union[str, dict]\n-class ABCAction(ABC):\n+class ABCAction:\ntype: str\ndef get_data(self) -> dict:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "@@ -43,7 +43,7 @@ class BaseMessageMin(MessagesMessage, ABC):\n@property\ndef ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\n- return getattr(self, \"unprepared_ctx_api\")\n+ return self.unprepared_ctx_api # type: ignore\n@property\ndef mention(self) -> Optional[Mention]:\n@@ -61,7 +61,7 @@ class BaseMessageMin(MessagesMessage, ABC):\n@abstractmethod\ndef is_mentioned(self) -> bool:\n\"\"\"Returns True if current bot is mentioned in message\"\"\"\n- pass\n+ ...\n@overload\nasync def get_user(self, raw_mode: Literal[False] = ..., **kwargs) -> UsersUserFull:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/base.py",
"new_path": "vkbottle/tools/dev/uploader/base.py",
"diff": "@@ -69,7 +69,7 @@ class BaseUploader(ABC):\ndef generate_attachment_string(\nattachment_type: str, owner_id: int, item_id: int, access_key: Optional[str] = None\n) -> str:\n- return f\"{attachment_type}{owner_id}_{item_id}{('_' + access_key) if access_key else ''}\"\n+ return f\"{attachment_type}{owner_id}_{item_id}{f'_{access_key}' if access_key else ''}\"\n@staticmethod\nasync def read(file_source: Union[str, \"Bytes\"]) -> \"Bytes\":\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/doc.py",
"new_path": "vkbottle/tools/dev/uploader/doc.py",
"diff": "-from abc import ABC\nfrom typing import TYPE_CHECKING, Union\nfrom .base import BaseUploader\n@@ -7,7 +6,7 @@ if TYPE_CHECKING:\nfrom .base import Bytes\n-class DocUploader(BaseUploader, ABC):\n+class DocUploader(BaseUploader):\nNAME = \"doc.txt\"\nasync def get_server(self, **kwargs) -> dict:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/photo.py",
"new_path": "vkbottle/tools/dev/uploader/photo.py",
"diff": "-from abc import ABC\nfrom typing import TYPE_CHECKING, List, Union\nfrom .base import BaseUploader\n@@ -7,7 +6,7 @@ if TYPE_CHECKING:\nfrom .base import Bytes\n-class PhotoUploader(BaseUploader, ABC):\n+class PhotoUploader(BaseUploader):\nNAME = \"picture.jpg\"\n@property\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add `flake8-bugbear`; Fix it's errors
|
718,844 |
11.09.2022 00:59:19
| -10,800 |
ffcaa6dfc58fd4e16940576ce0beaa5751d14d6b
|
Fix flake8-bugbear `B009` error
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"diff": "@@ -33,7 +33,7 @@ class BaseForeignMessageMin(MessagesForeignMessage, ABC):\n@property\ndef ctx_api(self) -> Union[\"ABCAPI\", \"API\"]:\n- return getattr(self, \"unprepared_ctx_api\")\n+ return self.unprepared_ctx_api # type: ignore\n@property\ndef mention(self) -> Optional[Mention]:\n@@ -51,7 +51,6 @@ class BaseForeignMessageMin(MessagesForeignMessage, ABC):\n@abstractmethod\ndef is_mentioned(self) -> bool:\n\"\"\"Returns True if current bot is mentioned in message\"\"\"\n- pass\nasync def get_user(self, raw_mode: bool = False, **kwargs) -> Union[UsersUserFull, dict]:\nraw_user = (await self.ctx_api.request(\"users.get\", {\"user_ids\": self.from_id, **kwargs}))[\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix flake8-bugbear `B009` error
|
718,844 |
16.09.2022 16:14:42
| -10,800 |
bd158fd5d7829633647254c1e5d42963cf90add7
|
Add `flake8-pie` & `dlint`; Fix theirs issues
|
[
{
"change_type": "MODIFY",
"old_path": "poetry.lock",
"new_path": "poetry.lock",
"diff": "@@ -205,6 +205,17 @@ category = \"dev\"\noptional = false\npython-versions = \"*\"\n+[[package]]\n+name = \"dlint\"\n+version = \"0.13.0\"\n+description = \"Dlint is a tool for encouraging best coding practices and helping ensure Python code is secure.\"\n+category = \"dev\"\n+optional = false\n+python-versions = \"*\"\n+\n+[package.dependencies]\n+flake8 = \">=3.6.0,<6.0.0\"\n+\n[[package]]\nname = \"entrypoints\"\nversion = \"0.4\"\n@@ -289,6 +300,17 @@ python-versions = \"*\"\nlint = [\"flake8\"]\ntest = [\"PyHamcrest\", \"pytest\", \"pytest-cov\"]\n+[[package]]\n+name = \"flake8-pie\"\n+version = \"0.16.0\"\n+description = \"A flake8 extension that implements misc. lints\"\n+category = \"dev\"\n+optional = false\n+python-versions = \">=3.7\"\n+\n+[package.dependencies]\n+typing_extensions = \"*\"\n+\n[[package]]\nname = \"flake8-scream\"\nversion = \"0.1.0\"\n@@ -817,7 +839,7 @@ testing = [\"func-timeout\", \"jaraco.itertools\", \"pytest (>=6)\", \"pytest-black (>=\n[metadata]\nlock-version = \"1.1\"\npython-versions = \"^3.7.2\"\n-content-hash = \"70d7d1420fbbc58cdec649ad2e76434565880851d0816cc99db3f0049c366482\"\n+content-hash = \"f0ecb2920eaf0e898a95f0dbb0dd992493bfcd4995cbc63b06a74a7fd834ce42\"\n[metadata.files]\naiofiles = [\n@@ -1027,6 +1049,9 @@ distlib = [\n{file = \"distlib-0.3.6-py2.py3-none-any.whl\", hash = \"sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e\"},\n{file = \"distlib-0.3.6.tar.gz\", hash = \"sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46\"},\n]\n+dlint = [\n+ {file = \"dlint-0.13.0-py3-none-any.whl\", hash = \"sha256:72094f35711a338eed4b8f95cbbaade5ec1d784bec516933bdbc2863676c4298\"},\n+]\nentrypoints = [\n{file = \"entrypoints-0.4-py3-none-any.whl\", hash = \"sha256:f174b5ff827504fd3cd97cc3f8649f3693f51538c7e4bdf3ef002c8429d42f9f\"},\n{file = \"entrypoints-0.4.tar.gz\", hash = \"sha256:b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4\"},\n@@ -1054,6 +1079,10 @@ flake8-bugbear = [\nflake8-logging-format = [\n{file = \"flake8-logging-format-0.7.5.tar.gz\", hash = \"sha256:54f7e349c934ce5c594f251885bc2240e99f6b48752a672a8fc7e3d1388352bb\"},\n]\n+flake8-pie = [\n+ {file = \"flake8-pie-0.16.0.tar.gz\", hash = \"sha256:b8dcb7b92706fa33d05d92a4b3e49b7a9fd3f0041849166275b646ba50e515ba\"},\n+ {file = \"flake8_pie-0.16.0-py3-none-any.whl\", hash = \"sha256:24cd7849b0eee22e2328b9e9d2a1dea40013b0a3106864bbadd06a4b05dbb71f\"},\n+]\nflake8-scream = [\n{file = \"flake8_scream-0.1.0-py3-none-any.whl\", hash = \"sha256:11e03260c64364d22ee1c8de4773bc382beb317b826a0f602c4b898f5fde0649\"},\n{file = \"flake8_scream-0.1.0.tar.gz\", hash = \"sha256:0f1e04fdd90db44cda46b38619e99f9463f4bceefb59701b4e160782097b7580\"},\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -66,6 +66,8 @@ flake8-scream = \"^0.1.0\"\nflake8-logging-format = \"^0.7.5\"\nflake8-annotations-complexity = \"^0.0.7\"\nflake8-alphabetize = \"^0.0.17\"\n+flake8-pie = \"^0.16.0\"\n+dlint = \"^0.13.0\"\n# Tests\npytest = \"^7.1.3\"\npytest-asyncio = \"^0.19.0\"\n@@ -134,6 +136,10 @@ exclude = [\n\"-AZ200\",\n\"-AZ300\"\n]\n+flake8-pie = [\n+ \"+*\",\n+ \"-PIE786\",\n+]\npycodestyle = [\n\"+*\",\n\"-E203\", # whitespace before ':' (black)\n@@ -144,3 +150,4 @@ pycodestyle = [\npylint = [\"+*\"]\npyflakes = [\"+*\"]\nmccabe = [\"+*\"]\n+dlint = [\"+*\", \"-DUO102\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -241,11 +241,7 @@ class ChatActionRule(ABCRule[BaseMessageMin]):\nself.chat_action_types = chat_action_types\nasync def check(self, event: BaseMessageMin) -> bool:\n- if not event.action:\n- return False\n- elif event.action.type.value in self.chat_action_types:\n- return True\n- return False\n+ return event.action.type.value in self.chat_action_types if event.action else False\nclass PayloadRule(ABCRule[BaseMessageMin]):\n@@ -308,9 +304,9 @@ class PayloadMapRule(ABCRule[BaseMessageMin]):\nasync def match(cls, payload: dict, payload_map: PayloadMapStrict) -> bool:\n\"\"\"Matches payload with payload_map recursively\"\"\"\nfor (k, validator) in payload_map: # noqa: SIM111\n- if k not in payload: # noqa: SIM114\n+ if k not in payload:\nreturn False\n- elif isinstance(validator, list): # noqa: SIM102\n+ elif isinstance(validator, list):\nif not (isinstance(payload[k], dict) and await cls.match(payload[k], validator)):\nreturn False\nelif not await validator.check(payload[k]):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tests/test_bot.py",
"new_path": "vkbottle/tests/test_bot.py",
"diff": "@@ -118,7 +118,7 @@ async def test_bot_polling(): # noqa: CCR001\nelif \"!SERVER!\" in url:\nreturn EXAMPLE_EVENT\nelif \"messages.send\" in url:\n- _r = {**data, **{\"r\": 1}}\n+ _r = {**data, \"r\": 1}\nreturn {\"response\": [_r]} if \"peer_ids\" in data else {\"response\": _r}\nbot = Bot(api=TestApi(\"token\"))\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/keyboard/keyboard.py",
"new_path": "vkbottle/tools/dev/keyboard/keyboard.py",
"diff": "@@ -24,7 +24,7 @@ class Keyboard:\ndef add(\nself, action: \"ABCAction\", color: Optional[\"KeyboardButtonColor\"] = None\n) -> \"Keyboard\":\n- if not len(self.buttons):\n+ if not self.buttons:\nself.row()\nbutton = KeyboardButton.from_typed(action, color)\nself.buttons[-1].append(button)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/loop_wrapper.py",
"new_path": "vkbottle/tools/dev/loop_wrapper.py",
"diff": "@@ -33,7 +33,7 @@ class LoopWrapper:\ndef run_forever(self, loop: Optional[AbstractEventLoop] = None) -> NoReturn: # type: ignore\n\"\"\"Runs startup tasks and makes the loop running forever\"\"\"\n- if not len(self.tasks):\n+ if not self.tasks:\nlogger.warning(\"You ran loop with 0 tasks. Is it ok?\")\nloop = loop or get_event_loop()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"new_path": "vkbottle/tools/dev/vkscript_converter/definitions.py",
"diff": "@@ -204,7 +204,7 @@ def if_statement(d: ast.If):\n+ \"){\"\n+ \"\".join(find(li) for li in d.body)\n+ \"}else{\"\n- + (\"\".join(find(e) for e in d.orelse) if len(d.orelse) else \"\")\n+ + (\"\".join(find(e) for e in d.orelse) if d.orelse else \"\")\n+ \"};\"\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/tests/test_tools.py",
"new_path": "vkbottle/tools/tests/test_tools.py",
"diff": "@@ -76,7 +76,7 @@ def assert_rule(res, rev=False):\nassert (res is not False) is not rev\n-class MockedLoop:\n+class MockedLoop: # noqa: PIE798\n@staticmethod\ndef create_task(task):\nctx_storage.set(\"checked-test-lw-create-task\", task.__name__)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add `flake8-pie` & `dlint`; Fix theirs issues
|
718,844 |
16.09.2022 18:26:09
| -10,800 |
4389abac09cce7306517dbae95b60f27bbed821a
|
Add `flake8-comprehensions`; Fix issue with `event_data`
|
[
{
"change_type": "MODIFY",
"old_path": "poetry.lock",
"new_path": "poetry.lock",
"diff": "@@ -288,6 +288,18 @@ flake8 = \">=3.0.0\"\n[package.extras]\ndev = [\"coverage\", \"hypothesis\", \"hypothesmith (>=0.2)\", \"pre-commit\"]\n+[[package]]\n+name = \"flake8-comprehensions\"\n+version = \"3.10.0\"\n+description = \"A flake8 plugin to help you write better list/set/dict comprehensions.\"\n+category = \"dev\"\n+optional = false\n+python-versions = \">=3.7\"\n+\n+[package.dependencies]\n+flake8 = \">=3.0,<3.2.0 || >3.2.0\"\n+importlib-metadata = {version = \"*\", markers = \"python_version < \\\"3.8\\\"\"}\n+\n[[package]]\nname = \"flake8-logging-format\"\nversion = \"0.7.5\"\n@@ -839,7 +851,7 @@ testing = [\"func-timeout\", \"jaraco.itertools\", \"pytest (>=6)\", \"pytest-black (>=\n[metadata]\nlock-version = \"1.1\"\npython-versions = \"^3.7.2\"\n-content-hash = \"f0ecb2920eaf0e898a95f0dbb0dd992493bfcd4995cbc63b06a74a7fd834ce42\"\n+content-hash = \"9e1630fb03d28da5703602b8e1a39775ea854594bc9ff38487d5b75ac21db552\"\n[metadata.files]\naiofiles = [\n@@ -1076,6 +1088,10 @@ flake8-bugbear = [\n{file = \"flake8-bugbear-22.9.11.tar.gz\", hash = \"sha256:39236c0e97160d1ab05d9f87422173d16e925a6220b3635bfc4aee766bf8194a\"},\n{file = \"flake8_bugbear-22.9.11-py3-none-any.whl\", hash = \"sha256:e74350a4cfc670e184f3433c223b1e7378f1cf8345ded6c8f12ac1a50c5df22b\"},\n]\n+flake8-comprehensions = [\n+ {file = \"flake8-comprehensions-3.10.0.tar.gz\", hash = \"sha256:181158f7e7aa26a63a0a38e6017cef28c6adee71278ce56ce11f6ec9c4905058\"},\n+ {file = \"flake8_comprehensions-3.10.0-py3-none-any.whl\", hash = \"sha256:dad454fd3d525039121e98fa1dd90c46bc138708196a4ebbc949ad3c859adedb\"},\n+]\nflake8-logging-format = [\n{file = \"flake8-logging-format-0.7.5.tar.gz\", hash = \"sha256:54f7e349c934ce5c594f251885bc2240e99f6b48752a672a8fc7e3d1388352bb\"},\n]\n"
},
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -67,6 +67,7 @@ flake8-logging-format = \"^0.7.5\"\nflake8-annotations-complexity = \"^0.0.7\"\nflake8-alphabetize = \"^0.0.17\"\nflake8-pie = \"^0.16.0\"\n+flake8-comprehensions = \"^3.10.0\"\ndlint = \"^0.13.0\"\n# Tests\npytest = \"^7.1.3\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tests/fixtures/middlewares.py",
"new_path": "vkbottle/tests/fixtures/middlewares.py",
"diff": "@@ -18,7 +18,7 @@ def empty_middleware_class():\n@pytest.fixture\ndef empty_event():\n- return dict()\n+ return {}\n@pytest.fixture\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tests/test_bot.py",
"new_path": "vkbottle/tests/test_bot.py",
"diff": "@@ -162,7 +162,7 @@ async def test_bot_scopes():\ndef fake_message(ctx_api: API, **data: Any) -> Message:\n- message = dict(peer_id=1, date=1, from_id=1, text=\"test\", out=0, id=1)\n+ message = {\"peer_id\": 1, \"date\": 1, \"from_id\": 1, \"text\": \"test\", \"out\": 0, \"id\": 1}\nmessage.update(data)\nreturn message_min(\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/event_data.py",
"new_path": "vkbottle/tools/dev/event_data.py",
"diff": "@@ -4,17 +4,17 @@ from pydantic import BaseModel, Field\nclass ShowSnackbarEvent(BaseModel):\n- type: str = Field(\"show_snackbar\", const=True)\n+ type: str = Field(default=\"show_snackbar\", const=True)\ntext: str\nclass OpenLinkEvent(BaseModel):\n- type: str = Field(\"open_link\", const=True)\n+ type: str = Field(default=\"open_link\", const=True)\nlink: str\nclass OpenAppEvent(BaseModel):\n- type: str = Field(\"open_app\", const=True)\n+ type: str = Field(default=\"open_app\", const=True)\nowner_id: Optional[int] = None\napp_id: int\nhash: str\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"new_path": "vkbottle/tools/dev/mini_types/bot/message_event.py",
"diff": "@@ -38,12 +38,12 @@ class MessageEventMin(MessageEvent):\nself.event_id = self.object.event_id\nasync def send_message_event_answer(self, event_data: \"EventDataType\", **kwargs) -> int:\n- data = dict(\n- event_id=self.event_id,\n- user_id=self.user_id,\n- peer_id=self.peer_id,\n- event_data=event_data.json(),\n- )\n+ data = {\n+ \"event_id\": self.event_id,\n+ \"user_id\": self.user_id,\n+ \"peer_id\": self.peer_id,\n+ \"event_data\": event_data.json(),\n+ }\ndata.update(kwargs)\nreturn (await self.ctx_api.request(\"messages.sendMessageEventAnswer\", data))[\"response\"]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add `flake8-comprehensions`; Fix issue with `event_data`
|
718,844 |
01.10.2022 20:47:35
| -10,800 |
dc273c836727eb26339ec24369e3886d5b458306
|
Add workound for github dependency-graph (github/feedback#6456)
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "setup.py",
"diff": "+#!/usr/bin/env python\n+\n+import sys\n+\n+from setuptools import setup\n+\n+sys.stderr.write(\n+ \"\"\"\n+This installation method is just a workound for github dependency-graph\n+which doesn't support pyproject.toml metadata yet.\n+See: https://github.com/orgs/community/discussions/6456\n+\n+Please use following command to install this package:\n+pip install .\n+\"\"\"\n+)\n+sys.exit(1)\n+\n+setup(\n+ name=\"vkbottle\",\n+ requires=[],\n+)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add workound for github dependency-graph (github/feedback#6456)
|
718,844 |
03.10.2022 06:01:00
| -10,800 |
3bc44361941d4152a083cbdbc5cc7784d0e17bf4
|
Simplify code in bot_callback
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/callback/bot_callback.py",
"new_path": "vkbottle/callback/bot_callback.py",
"diff": "@@ -43,11 +43,8 @@ class BotCallback(ABCCallback):\nasync def find_server_id(self) -> Optional[int]:\nservers = await self.get_callback_servers()\n- if not servers:\n- return None\n- for server in servers:\n- if server[\"url\"] == self.url:\n- return server[\"id\"]\n+ if servers:\n+ return next((server[\"id\"] for server in servers if server[\"url\"] == self.url), None)\nreturn None\nasync def add_callback_server(self) -> int:\n@@ -75,8 +72,9 @@ class BotCallback(ABCCallback):\n\"title\": self.title,\n\"secret_key\": self.secret_key,\n}\n+\nif secret_key is not None:\n- data.update({\"secret_key\": secret_key})\n+ data[\"secret_key\"] = secret_key\nawait self.api.request(\"groups.editCallbackServer\", data)\nasync def get_callback_confirmation_code(self) -> str:\n@@ -96,7 +94,7 @@ class BotCallback(ABCCallback):\nlogger.debug(\"Getting callback servers...\")\ndata: Dict[str, Any] = {\"group_id\": self.group_id}\nif servers_ids is not None:\n- data.update({\"server_ids\": \",\".join(map(str, servers_ids))})\n+ data[\"server_ids\"] = \",\".join(map(str, servers_ids))\nreturn (await self.api.request(\"groups.getCallbackServers\", data))[\"response\"][\"items\"]\nasync def get_callback_settings(self, server_id: int) -> Dict[str, bool]:\n@@ -117,7 +115,7 @@ class BotCallback(ABCCallback):\nif params is not None:\nfor k, v in params.items():\n- data.update({k: v})\n+ data[k] = v\nawait self.api.request(\"groups.setCallbackSettings\", data)\ndef construct(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Simplify code in bot_callback
|
718,844 |
03.10.2022 06:07:11
| -10,800 |
d36d0c62fcb6f87f5b54b357e2c58d575155ce04
|
Fix wrong api instance usage in bot
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -113,7 +113,7 @@ class Bot(ABCFramework):\nreturn confirmation_code, secret_key\nasync def process_event(self, event: dict):\n- await self.router.route(event, self.callback.api)\n+ await self.router.route(event, self.api)\n@property\ndef loop(self) -> asyncio.AbstractEventLoop:\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix wrong api instance usage in bot
|
718,844 |
03.10.2022 07:10:55
| -10,800 |
4086ed7626963d3bf568ef75d585bc92184f0762
|
Fix message event processing without handlers
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/bot/message.py",
"new_path": "vkbottle/dispatch/views/bot/message.py",
"diff": "@@ -30,7 +30,10 @@ class ABCBotMessageView(ABCMessageView[dict, F_contra], Generic[F_contra]):\nreturn message_min(event, ctx_api, replace_mention)\nasync def process_event(self, event: dict) -> bool:\n- return GroupEventType(self.get_event_type(event)) == GroupEventType.MESSAGE_NEW\n+ if not (self.handlers or self.middlewares):\n+ return False\n+ typed_event = GroupEventType(self.get_event_type(event))\n+ return typed_event == GroupEventType.MESSAGE_NEW\nclass BotMessageView(ABCBotMessageView[\"MessageMin\"]):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/views/user/message.py",
"new_path": "vkbottle/dispatch/views/user/message.py",
"diff": "@@ -34,7 +34,7 @@ class ABCUserMessageView(ABCMessageView[list, F_contra], Generic[F_contra]):\ntry:\nevent_type = UserEventType(self.get_event_type(event))\nexcept ValueError:\n- event_type = UserEventType.UNDEFINED_EVENT\n+ return False\nreturn event_type == UserEventType.MESSAGE_NEW\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix message event processing without handlers
|
718,844 |
09.10.2022 16:48:43
| -10,800 |
959c6b1bf581a6fcda7123f2dfadeca35d6bc23e
|
Fix group user polling example
|
[
{
"change_type": "MODIFY",
"old_path": "examples/high-level/group_user_pooling_example.py",
"new_path": "examples/high-level/group_user_pooling_example.py",
"diff": "from typing import TYPE_CHECKING, Optional\nfrom vkbottle_types.events.enums import UserEventType\n+from vkbottle_types.events.user_events import RawUserEvent\nfrom vkbottle import Bot\nfrom vkbottle.framework.labeler import UserLabeler\n@@ -20,13 +21,21 @@ class BotMessagesPooling(UserPolling):\ndef __init__(\nself,\napi: Optional[\"ABCAPI\"] = None,\n- group_id: Optional[int] = None,\n+ user_id: Optional[int] = None,\nwait: Optional[int] = None,\nmode: Optional[int] = None,\nrps_delay: Optional[int] = None,\nerror_handler: Optional[\"ABCErrorHandler\"] = None,\n+ group_id: Optional[int] = None,\n):\n- super().__init__(api, wait, mode, rps_delay, error_handler)\n+ super().__init__(\n+ api=api,\n+ user_id=user_id,\n+ wait=wait,\n+ mode=mode,\n+ rps_delay=rps_delay,\n+ error_handler=error_handler,\n+ )\nself.group_id = group_id\nasync def get_server(self) -> dict:\n@@ -40,15 +49,11 @@ token = \"...\"\nbot = Bot(token, labeler=UserLabeler(), polling=BotMessagesPooling())\n-@bot.on.raw_event(UserEventType.CHAT_INFO_EDIT)\n+@bot.on.raw_event(UserEventType.CHAT_INFO_EDIT, dataclass=RawUserEvent) # type: ignore\nasync def process_event(event):\n- if event.object[1] == 7:\n- type_action = \"left\"\n- elif event.object[1] == 6:\n- type_action = \"returned to the\"\n+ type_action = \"left\" if event.object[1] == 7 else \"returned to the\"\nif event.object[1] in (6, 7):\nlogger.info(\"User {} {} conversation {}.\", event.object[3], type_action, event.object[2])\n-if __name__ == \"__main__\":\nbot.run_forever()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix group user polling example
|
718,844 |
18.10.2022 02:24:42
| -10,800 |
bc059ca878bf38c5652fd190a0b6043d2dd86655
|
Fix `CommandRule` check for 0 args
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.3.10\"\n+version = \"4.3.11\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nmaintainers = [\"FeeeeK\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -78,7 +78,7 @@ class CommandRule(ABCRule[BaseMessageMin]):\nfor prefix in self.prefixes:\ntext_lenght = len(prefix + self.command_text)\ntext_lenght_with_sep = text_lenght + len(self.sep)\n- if self.args_count == 0 and event.text == text_lenght:\n+ if self.args_count == 0 and len(event.text) == text_lenght:\nreturn True\nelif event.text.startswith(prefix + self.command_text + self.sep):\nargs = event.text[text_lenght_with_sep:].split(self.sep)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tests/test_bot.py",
"new_path": "vkbottle/tests/test_bot.py",
"diff": "@@ -244,6 +244,15 @@ async def test_rules(api: API):\nis False\n)\n+ assert (\n+ await base.CommandRule(\"cmd\", [\"!\", \".\"], 0).check(fake_message(api, text=\"!cmd test bar\"))\n+ is False\n+ )\n+\n+ assert (\n+ await base.CommandRule(\"cmd\", [\"!\", \".\"], 0).check(fake_message(api, text=\"!cmd\")) is True\n+ )\n+\nlabeler = BotLabeler()\nlabeler.vbml_ignore_case = True\nassert (\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `CommandRule` check for 0 args (#577)
|
718,844 |
18.10.2022 10:07:15
| -10,800 |
e73f157856f35041d3a83ae05cab85a512383bc7
|
Fix typing in `ctx_storage`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/storage/ctx_storage.py",
"new_path": "vkbottle/tools/dev/storage/ctx_storage.py",
"diff": "-from typing import Any, Hashable\n+from typing import Any, Hashable, Optional\nfrom vkbottle.tools.dev.ctx_tool import BaseContext\n@@ -14,7 +14,7 @@ class CtxStorage(ABCStorage, BaseContext):\ndef __init__(\nself,\n- default: dict = None,\n+ default: Optional[dict] = None,\nforce_reset: bool = False,\n):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix typing in `ctx_storage`
|
718,844 |
18.10.2022 10:09:43
| -10,800 |
41f5f649c0b5b7fbd2620aab683d22933edb2446
|
Replace `loop` operations with `asyncio.run`
|
[
{
"change_type": "MODIFY",
"old_path": "examples/low-level/api_request_example.py",
"new_path": "examples/low-level/api_request_example.py",
"diff": "@@ -16,5 +16,4 @@ async def main():\nprint(response)\n-loop = asyncio.get_event_loop()\n-loop.run_until_complete(main())\n+asyncio.run(main())\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/low-level/http_example.py",
"new_path": "examples/low-level/http_example.py",
"diff": "@@ -9,5 +9,4 @@ async def main():\nawait http.close()\n-loop = asyncio.get_event_loop()\n-loop.run_until_complete(main())\n+asyncio.run(main())\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/modules.py",
"new_path": "vkbottle/modules.py",
"diff": "@@ -94,7 +94,7 @@ if hasattr(asyncio, \"WindowsProactorEventLoopPolicy\") and isinstance(\nhttps://github.com/aio-libs/aiohttp/issues/4324\nThis also can be fixed by using loop.run_until_complete instead of asyncio.run\n- but I like to use asyncio.run because it's more readable.\n+ but I like to use asyncio.run because it's more readable, and not require to create new event loop.\n\"\"\"\nfrom asyncio.proactor_events import _ProactorBasePipeTransport, _ProactorBaseWritePipeTransport\nfrom functools import wraps\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Replace `loop` operations with `asyncio.run`
|
718,877 |
18.10.2022 20:52:52
| -18,000 |
194065880f6543857b92dbf5c06d3fa29b98817e
|
Fix `CommandRule` checking event.text
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/rules/base.py",
"new_path": "vkbottle/dispatch/rules/base.py",
"diff": "@@ -76,12 +76,13 @@ class CommandRule(ABCRule[BaseMessageMin]):\nasync def check(self, event: BaseMessageMin) -> Union[dict, bool]:\nfor prefix in self.prefixes:\n- text_lenght = len(prefix + self.command_text)\n- text_lenght_with_sep = text_lenght + len(self.sep)\n- if self.args_count == 0 and len(event.text) == text_lenght:\n+ text_length = len(prefix + self.command_text)\n+ text_length_with_sep = text_length + len(self.sep)\n+ if event.text.startswith(prefix + self.command_text):\n+ if not self.args_count and len(event.text) == text_length:\nreturn True\n- elif event.text.startswith(prefix + self.command_text + self.sep):\n- args = event.text[text_lenght_with_sep:].split(self.sep)\n+ elif self.args_count and self.sep in event.text:\n+ args = event.text[text_length_with_sep:].split(self.sep)\nreturn {\"args\": args} if len(args) == self.args_count and all(args) else False\nreturn False\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `CommandRule` checking event.text (#579)
|
718,844 |
31.10.2022 01:27:08
| -10,800 |
363dd79ada0e08848e21254c970eddf28d750458
|
Deprecate blueprints
|
[
{
"change_type": "MODIFY",
"old_path": "docs/high-level/bot/index.md",
"new_path": "docs/high-level/bot/index.md",
"diff": "* [Bot](bot.md)\n* [User](../user/user.md)\n-* [Blueprint](blueprint.md)\n* [Labeler](labeler.md)\n* [Multibot](multibot.md)\n"
},
{
"change_type": "DELETE",
"old_path": "examples/high-level/blueprint.py",
"new_path": null,
"diff": "-import logging\n-import os\n-\n-from vkbottle import Bot\n-\n-from .blueprints import bps\n-\n-# You should provide API to bot before\n-# constructing blueprints otherwise they won't\n-# have it, API is not needed if you are not\n-# requested to use it outside of handlers and\n-# cannot be passed to blueprint if you use\n-# multibot. Read the docs at\n-# > high-level/bot/blueprint\n-bot = Bot(os.environ[\"token\"])\n-logging.basicConfig(level=logging.INFO)\n-\n-for bp in bps:\n- bp.load(bot)\n-\n-# Moreover, you can use:\n-# from vkbottle import load_blueprints_from_package\n-# for bp in load_blueprints_from_package(\"blueprints\"):\n-# bp.load(bot)\n-\n-bot.run_forever()\n"
},
{
"change_type": "DELETE",
"old_path": "examples/high-level/blueprints/__init__.py",
"new_path": null,
"diff": "-from . import goodbyes, greetings\n-\n-bps = [greetings.bp, goodbyes.bp]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/high-level/code_separation/handlers/__init__.py",
"diff": "+from . import goodbyes, greetings\n+\n+labelers = [greetings.labeler, goodbyes.labeler]\n+\n+__all__ = [\"labelers\"]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/high-level/code_separation/main.py",
"diff": "+import os\n+\n+from vkbottle import Bot\n+\n+from .handlers import labelers\n+\n+bot = Bot(os.environ[\"token\"])\n+\n+for labeler in labelers:\n+ bot.labeler.load(labeler)\n+\n+bot.run_forever()\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/high-level/easy_bot.py",
"new_path": "examples/high-level/easy_bot.py",
"diff": "@@ -50,7 +50,7 @@ async def mention_handler(message: Message):\nasync def group_join_handler(event: GroupTypes.GroupJoin):\ntry:\n- # Basic API call, please notice that bot.api (or blueprint.api) is\n+ # Basic API call, please notice that bot.api is\n# not accessible in case multibot is used, API can be accessed from\n# event.ctx_api\nawait bot.api.messages.send(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/blueprint.py",
"new_path": "vkbottle/framework/bot/blueprint.py",
"diff": "@@ -19,6 +19,10 @@ class BotBlueprint(ABCBlueprint):\nlabeler: Optional[BotLabeler] = None,\nrouter: Optional[Router] = None,\n):\n+ logger.warning(\n+ \"Blueprints was deprecated and will be removed in future releases, read about new code separation method in documentation: \\n\"\n+ \"https://vkbottle.readthedocs.io/ru/latest/tutorial/code-separation/\"\n+ )\nif name is not None:\nself.name = name\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/blueprint.py",
"new_path": "vkbottle/framework/user/blueprint.py",
"diff": "@@ -19,6 +19,10 @@ class UserBlueprint(ABCBlueprint):\nlabeler: Optional[UserLabeler] = None,\nrouter: Optional[Router] = None,\n):\n+ logger.warning(\n+ \"Blueprints was deprecated and will be removed in future releases, read about new code separation method in documentation: \\n\"\n+ \"https://vkbottle.readthedocs.io/ru/latest/tutorial/code-separation/\"\n+ )\nif name is not None:\nself.name = name\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/utils.py",
"new_path": "vkbottle/tools/dev/utils.py",
"diff": "@@ -5,6 +5,8 @@ import re\nfrom concurrent.futures import ThreadPoolExecutor\nfrom typing import TYPE_CHECKING, Any, Coroutine, Iterator, TypeVar\n+from vkbottle.modules import logger\n+\nif TYPE_CHECKING:\nfrom vkbottle.framework.abc_blueprint import ABCBlueprint\n@@ -30,6 +32,10 @@ def load_blueprints_from_package(package_name: str) -> Iterator[\"ABCBlueprint\"]:\n>>> for bp in load_blueprints_from_package(\"blueprints\"):\n>>> bp.load(...)\n\"\"\"\n+ logger.warning(\n+ \"Blueprints was deprecated and will be removed in future releases, read about new code separation method in documentation: \\n\"\n+ \"https://vkbottle.readthedocs.io/ru/latest/tutorial/code-separation/\"\n+ )\nbp_paths = []\nfor filename in os.listdir(package_name):\nif filename.startswith(\"__\"):\n@@ -47,6 +53,6 @@ def load_blueprints_from_package(package_name: str) -> Iterator[\"ABCBlueprint\"]:\nfor bp_path in bp_paths:\nmodule, bp_name = bp_path\n- module_name = package_name.replace(\".\" + os.sep, \".\").replace(os.sep, \".\")\n- bp_module = importlib.import_module(module_name + \".\" + module)\n+ module_name = package_name.replace(f\".{os.sep}\", \".\").replace(os.sep, \".\")\n+ bp_module = importlib.import_module(f\"{module_name}.{module}\")\nyield getattr(bp_module, bp_name)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Deprecate blueprints
|
718,844 |
31.10.2022 01:27:37
| -10,800 |
f45755ea493d26ec664ccb6209afdf1e98011fa6
|
Fix deprecated `inspect.getargspec` usage
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/modules.py",
"new_path": "vkbottle/modules.py",
"diff": "@@ -72,7 +72,7 @@ elif logging_module == \"logging\":\ndef process(self, msg, args, kwargs):\nlog_kwargs = {\nkey: kwargs[key]\n- for key in inspect.getargspec(self.logger._log).args[1:]\n+ for key in inspect.getfullargspec(self.logger._log).args[1:]\nif key in kwargs\n}\nif isinstance(msg, str):\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix deprecated `inspect.getargspec` usage
|
718,844 |
04.11.2022 00:41:06
| -10,800 |
36d42dfbd87438f20b6b90c86ddaed9761bd634e
|
Fix `flake8-bugbear` `B027` warnings
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/token_generator/abc.py",
"new_path": "vkbottle/api/token_generator/abc.py",
"diff": "@@ -6,15 +6,16 @@ class ABCTokenGenerator(ABC):\nasync def __aenter__(self):\nreturn await self.get_token()\n+ @abstractmethod\nasync def __aexit__(self, exc_type, exc_val, exc_tb):\npass\n- def __repr__(self) -> str:\n- return f\"<{self.__class__}>\"\n-\n@abstractmethod\nasync def get_token(self) -> str:\npass\n+ def __repr__(self) -> str:\n+ return f\"<{self.__class__}>\"\n+\nToken = Union[str, List[str], ABCTokenGenerator]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/token_generator/consistent.py",
"new_path": "vkbottle/api/token_generator/consistent.py",
"diff": "@@ -10,3 +10,6 @@ class ConsistentTokenGenerator(ABCTokenGenerator):\nasync def get_token(self) -> str:\nreturn next(self.tokens)\n+\n+ async def __aexit__(self, exc_type, exc_val, exc_tb):\n+ pass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/token_generator/single.py",
"new_path": "vkbottle/api/token_generator/single.py",
"diff": "@@ -7,3 +7,6 @@ class SingleTokenGenerator(ABCTokenGenerator):\nasync def get_token(self) -> str:\nreturn self.token\n+\n+ async def __aexit__(self, exc_type, exc_val, exc_tb):\n+ pass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/callback/abc.py",
"new_path": "vkbottle/callback/abc.py",
"diff": "@@ -59,7 +59,7 @@ class ABCCallback(ABC):\npass\n@api.setter\n- def api(self, new_api: \"ABCAPI\"):\n+ def api(self, new_api: \"ABCAPI\"): # noqa: B027\npass\n@abstractmethod\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/abc.py",
"new_path": "vkbottle/polling/abc.py",
"diff": "@@ -29,7 +29,7 @@ class ABCPolling(ABC):\npass\n@api.setter\n- def api(self, new_api: \"ABCAPI\"):\n+ def api(self, new_api: \"ABCAPI\"): # noqa: B027\npass\n@abstractmethod\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `flake8-bugbear` `B027` warnings
|
718,844 |
04.11.2022 01:02:37
| -10,800 |
87a830860162ce9f247b35a3b586ac639c3f4967
|
Add flakeheaven caching in CI
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -26,13 +26,6 @@ jobs:\n- name: Install poetry\nrun: pipx install poetry\n- - name: Cache .mypy_cache\n- id: cache-mypy\n- uses: actions/cache@v3\n- with:\n- key: ${{ matrix.python-version }}-${{ runner.os }}\n- path: .mypy_cache\n-\n- uses: actions/setup-python@v4.1.0\nid: python-setup\nwith:\n@@ -43,9 +36,23 @@ jobs:\nif: steps.python-setup.outputs.cache-hit != 'true'\nrun: poetry install --with dev\n+ - name: Cache ~/.cache/flakeheaven\n+ id: cache-flakeheaven\n+ uses: actions/cache@v3\n+ with:\n+ key: ${{ matrix.python-version }}-${{ runner.os }}\n+ path: ~/.cache/flakeheaven\n+\n- name: Run flakeheaven\nrun: poetry run flakeheaven lint\n+ - name: Cache .mypy_cache\n+ id: cache-mypy\n+ uses: actions/cache@v3\n+ with:\n+ key: ${{ matrix.python-version }}-${{ runner.os }}\n+ path: .mypy_cache\n+\n- name: Run mypy\nrun: poetry run mypy vkbottle\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add flakeheaven caching in CI
|
718,844 |
04.11.2022 07:58:28
| -10,800 |
6bc4265c5f2f1b157360389312c2b77f83e11dbb
|
Speedup CI with cache; Fix wrong python version
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "name: CI\non:\n- push:\n- branches: [master, dev]\n- pull_request:\n- branches: [master, dev]\n+ - push\n+ - pull_request\njobs:\nbuild:\nruns-on: ${{ matrix.os }}\n+ defaults:\n+ run:\n+ shell: bash\nstrategy:\nmax-parallel: 6\nmatrix:\n@@ -23,34 +24,51 @@ jobs:\nsteps:\n- uses: actions/checkout@v3\n- - name: Install poetry\n- run: pipx install poetry\n-\n- - uses: actions/setup-python@v4.1.0\n+ - uses: actions/setup-python@v4\nid: python-setup\nwith:\npython-version: ${{ matrix.python-version }}\n- cache: poetry\n+\n+ - name: Load cached poetry installation\n+ id: cached-poetry-installation\n+ uses: actions/cache@v3\n+ with:\n+ key: dotlocal-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('pyproject.toml') }}\n+ path: ~/.local\n+\n+\n+ - name: Install poetry\n+ uses: snok/install-poetry@v1\n+ with:\n+ virtualenvs-create: true\n+ virtualenvs-in-project: true\n+\n+ - name: Load cached venv\n+ id: cached-poetry-dependencies\n+ uses: actions/cache@v3\n+ with:\n+ key: venv-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('poetry.lock') }}\n+ path: .venv\n- name: Install dependencies\n- if: steps.python-setup.outputs.cache-hit != 'true'\n+ if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'\nrun: poetry install --with dev\n- - name: Cache ~/.cache/flakeheaven\n- id: cache-flakeheaven\n+ - name: Load cached ~/.cache/flakeheaven\n+ id: cached-flakeheaven\nuses: actions/cache@v3\nwith:\n- key: ${{ matrix.python-version }}-${{ runner.os }}\n+ key: flakeheaven-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('pyproject.toml') }}\npath: ~/.cache/flakeheaven\n- name: Run flakeheaven\nrun: poetry run flakeheaven lint\n- - name: Cache .mypy_cache\n- id: cache-mypy\n+ - name: Load cached .mypy_cache\n+ id: cached-mypy\nuses: actions/cache@v3\nwith:\n- key: ${{ matrix.python-version }}-${{ runner.os }}\n+ key: mypy-${{ matrix.python-version }}-${{ runner.os }}\npath: .mypy_cache\n- name: Run mypy\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Speedup CI with cache; Fix wrong python version
|
718,844 |
04.11.2022 08:00:17
| -10,800 |
14250b571bc5f8b1518a890e6a2d2a9551682e70
|
Fix positional only parameters usage
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/code_exception.py",
"new_path": "vkbottle/exception_factory/code_exception.py",
"diff": "@@ -26,23 +26,22 @@ class CodeExceptionMeta(type):\nreturn super().__call__(*args, **kwargs)\n@overload\n- def __getitem__(cls: T, code: int, /) -> Union[T, Any]:\n+ def __getitem__(cls: T, codes: int) -> Union[T, Any]:\n...\n@overload\n- def __getitem__(cls: T, codes: Tuple[int, ...], /) -> Union[Tuple[T, ...], Any]:\n+ def __getitem__(cls: T, codes: Tuple[int, ...]) -> Union[Tuple[T, ...], Any]:\n...\ndef __getitem__(\ncls: T,\n- code_or_codes: Union[int, Tuple[int, ...]],\n- /,\n+ codes: Union[int, Tuple[int, ...]],\n) -> Union[T, Tuple[T], Any]:\nif cls.__code_specified__:\nraise TypeError(\"exception code already specified\")\n- if isinstance(code_or_codes, tuple):\n- return tuple(cls._get_exception(code) for code in code_or_codes)\n- return cls._get_exception(code_or_codes)\n+ if isinstance(codes, tuple):\n+ return tuple(cls._get_exception(code) for code in codes)\n+ return cls._get_exception(codes)\ndef register_exception(cls: T, exception: T, code: int) -> None:\nexception.code = code\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix positional only parameters usage
|
718,844 |
04.11.2022 08:03:54
| -10,800 |
2065c4e1b95c2b1a1f2927715c391123c784b92d
|
Fix `B027` flake8-bugbear warning
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/callback/abc.py",
"new_path": "vkbottle/callback/abc.py",
"diff": "@@ -58,7 +58,7 @@ class ABCCallback(ABC):\ndef api(self) -> \"ABCAPI\":\npass\n- @api.setter\n+ @api.setter # noqa: B027\ndef api(self, new_api: \"ABCAPI\"): # noqa: B027\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/abc.py",
"new_path": "vkbottle/polling/abc.py",
"diff": "@@ -28,7 +28,7 @@ class ABCPolling(ABC):\ndef api(self) -> \"ABCAPI\":\npass\n- @api.setter\n+ @api.setter # noqa: B027\ndef api(self, new_api: \"ABCAPI\"): # noqa: B027\npass\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `B027` flake8-bugbear warning
|
718,844 |
06.11.2022 18:11:30
| -10,800 |
427234ef4fade3cc4efdc6a0903ecc2bcaa9beb0
|
Disable poetry caching (snok/install-poetry#105)
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -29,13 +29,12 @@ jobs:\nwith:\npython-version: ${{ matrix.python-version }}\n- - name: Load cached poetry installation\n- id: cached-poetry-installation\n- uses: actions/cache@v3\n- with:\n- key: dotlocal-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('pyproject.toml') }}\n- path: ~/.local\n-\n+ # - name: Load cached poetry installation\n+ # id: cached-poetry-installation\n+ # uses: actions/cache@v3\n+ # with:\n+ # key: dotlocal-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('pyproject.toml') }}\n+ # path: ~/.local\n- name: Install poetry\nuses: snok/install-poetry@v1\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Disable poetry caching (snok/install-poetry#105)
|
718,844 |
09.11.2022 18:52:02
| -10,800 |
a731262e9954e4329dae778264d3cded82c02797
|
Add pytest caching in actions
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -72,5 +72,12 @@ jobs:\n- name: Run mypy\nrun: poetry run mypy vkbottle\n+ - name: Load cached .pytest_cache\n+ id: cached-pytest\n+ uses: actions/cache@v3\n+ with:\n+ key: pytest-${{ matrix.python-version }}-${{ runner.os }}\n+ path: .pytest_cache\n+\n- name: Run tests\nrun: poetry run pytest\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add pytest caching in actions
|
718,844 |
10.11.2022 03:43:00
| -10,800 |
159d67deead6522506924ab17198d0c991202f4d
|
Fix error in uploader
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/base.py",
"new_path": "vkbottle/tools/dev/uploader/base.py",
"diff": "@@ -45,7 +45,7 @@ class BaseUploader(ABC):\n)\nreturn json.loads(raw_response)\n- def get_bytes_io(self, data: \"Bytes\", name: str = None) -> BytesIO:\n+ def get_bytes_io(self, data: \"Bytes\", name: str = \"\") -> BytesIO:\nbytes_io = data if isinstance(data, BytesIO) else BytesIO(data)\nbytes_io.seek(0) # To avoid errors with image generators (such as pillow)\nbytes_io.name = (\n@@ -61,7 +61,7 @@ class BaseUploader(ABC):\nif \"owner_id\" in upload_params:\nreturn upload_params[\"owner_id\"]\ntry:\n- return (await self.api.request(\"groups.getById\", {}))[\"response\"][0][\"id\"]\n+ return -(await self.api.request(\"groups.getById\", {}))[\"response\"][0][\"id\"]\nexcept VKAPIError:\nreturn (await self.api.request(\"users.get\", {}))[\"response\"][0][\"id\"]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix error in uploader
|
718,844 |
14.11.2022 22:31:07
| -10,800 |
994fd9902abaa1e7830e6d373d1d496c786a2abc
|
Fix typo (close
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "@@ -87,7 +87,7 @@ class Bot(ABCFramework):\nself.loop.create_task(self.router.route(update, polling.api))\ndef run_forever(self) -> NoReturn: # type: ignore\n- logger.info(\"Loop will be ran forever\")\n+ logger.info(\"Loop will be run forever\")\nself.loop_wrapper.add_task(self.run_polling())\nself.loop_wrapper.run_forever(self.loop)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "@@ -109,8 +109,8 @@ class User(ABCFramework):\nelse:\nself.loop.create_task(self.router.route(update, polling.api))\n- def run_forever(self) -> NoReturn:\n- logger.info(\"Loop will be ran forever\")\n+ def run_forever(self) -> NoReturn: # type: ignore\n+ logger.info(\"Loop will be run forever\")\nself.loop_wrapper.add_task(self.run_polling())\nself.loop_wrapper.run_forever(self.loop)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix typo (close #591)
|
718,844 |
18.10.2022 10:12:43
| -10,800 |
d0ea93b9052719d51d8787fe4718cef4cca0841a
|
Remove `.loop` from framework; Change `loop_wrapper` logic
|
[
{
"change_type": "MODIFY",
"old_path": "tests/tools/test_tools.py",
"new_path": "tests/tools/test_tools.py",
"diff": "+import asyncio\nimport os\nfrom io import StringIO\n@@ -76,25 +77,6 @@ def assert_rule(res, rev=False):\nassert (res is not False) is not rev\n-class MockedLoop: # noqa: PIE798\n- @staticmethod\n- def create_task(task):\n- ctx_storage.set(\"checked-test-lw-create-task\", task.__name__)\n-\n- @staticmethod\n- def run_until_complete(task):\n- c = ctx_storage.get(\"checked-test-lw-run-until-complete\") or []\n- ctx_storage.set(\"checked-test-lw-run-until-complete\", [*c, task.__name__])\n-\n- @staticmethod\n- def run_forever():\n- ctx_storage.set(\"checked-test-lw-run-forever\", True)\n-\n- @staticmethod\n- def is_running():\n- return False\n-\n-\ndef test_keyboard_non_builder():\nkeyboard = Keyboard(one_time=True)\nkeyboard.add(Text(\"I love nuggets\", {\"love\": \"nuggets\"}))\n@@ -197,36 +179,38 @@ async def test_validators():\ndef test_loop_wrapper():\nasync def task1():\n- pass\n+ ctx_storage.set(\"checked-test-lw-create-task\", \"task1\")\nasync def task2():\n- pass\n+ c = ctx_storage.get(\"checked-test-lw-run-until-complete\") or []\n+ ctx_storage.set(\"checked-test-lw-run-until-complete\", [*c, \"task2\"])\nasync def task3():\n- pass\n+ c = ctx_storage.get(\"checked-test-lw-run-until-complete\") or []\n+ ctx_storage.set(\"checked-test-lw-run-until-complete\", [*c, \"task3\"])\n- lw = LoopWrapper(tasks=[task1]) # type: ignore\n- lw.on_startup.append(task2) # type: ignore\n- lw.on_shutdown.append(task3) # type: ignore\n+ lw = LoopWrapper(tasks=[task1()])\n+ lw.on_startup.append(task2())\n+ lw.on_shutdown.append(task3())\n- lw.run_forever(MockedLoop()) # type: ignore\n+ lw.run() # type: ignore\nassert ctx_storage.get(\"checked-test-lw-create-task\") == task1.__name__\nassert ctx_storage.get(\"checked-test-lw-run-until-complete\") == [\ntask2.__name__,\ntask3.__name__,\n]\n- assert ctx_storage.get(\"checked-test-lw-run-forever\")\n@pytest.mark.asyncio\n-@pytest.mark.filterwarnings(\"ignore:coroutine\")\nasync def test_utils(mocker: MockerFixture):\n- async def task_to_run(s, y: int):\n+ async def task_to_run(s, y):\n+ ctx_storage.set(\"checked-test-lw-create-task\", \"task_to_run\")\nreturn s.x == y\n- mocker.patch(\"asyncio.get_running_loop\", lambda: MockedLoop())\n- run_in_task(task_to_run(1, 1))\n+ a = type(\"A\", (object,), {\"x\": 1})\n+ task = run_in_task(task_to_run(a, 1))\n+ await asyncio.gather(task)\nassert ctx_storage.get(\"checked-test-lw-create-task\") == \"task_to_run\"\n@@ -252,7 +236,7 @@ def test_run_multibot(mocker: MockerFixture):\nmocker.patch(\"vkbottle.bot.Bot.run_polling\", lambda s, custom_polling: s.api)\nmocker.patch(\"asyncio.iscoroutine\", lambda _: True)\nmocker.patch(\n- \"vkbottle.tools.dev.loop_wrapper.LoopWrapper.run_forever\",\n+ \"vkbottle.tools.dev.loop_wrapper.LoopWrapper.run\",\nlambda s: bot_apis.extend(s.tasks),\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/abc.py",
"new_path": "vkbottle/framework/abc.py",
"diff": "from abc import ABC, abstractmethod\n-from asyncio import AbstractEventLoop\nfrom typing import TYPE_CHECKING, NoReturn\nif TYPE_CHECKING:\n@@ -15,11 +14,6 @@ class ABCFramework(ABC):\ndef polling(self) -> \"ABCPolling\":\npass\n- @property\n- @abstractmethod\n- def loop(self) -> AbstractEventLoop:\n- pass\n-\n@abstractmethod\nasync def run_polling(self) -> NoReturn: # type: ignore\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/abc_blueprint.py",
"new_path": "vkbottle/framework/abc_blueprint.py",
"diff": "-import asyncio\nfrom abc import abstractmethod\nfrom typing import TYPE_CHECKING, Any, NoReturn, Optional, Union\n@@ -50,10 +49,6 @@ class ABCBlueprint(ABCFramework):\ndef state_dispenser(self, new_state_dispenser: \"ABCStateDispenser\"):\nself._state_dispenser = new_state_dispenser\n- @property\n- def loop(self) -> asyncio.AbstractEventLoop:\n- return asyncio.get_running_loop()\n-\n@property # type: ignore\ndef api(self) -> Union[\"ABCAPI\", \"API\"]: # type: ignore\nif not self._api:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/bot.py",
"new_path": "vkbottle/framework/bot/bot.py",
"diff": "-import asyncio\nfrom typing import TYPE_CHECKING, NoReturn, Optional, Tuple\nfrom vkbottle.api import API\n@@ -27,13 +26,12 @@ class Bot(ABCFramework):\napi: Optional[\"ABCAPI\"] = None,\npolling: Optional[\"ABCPolling\"] = None,\ncallback: Optional[\"ABCCallback\"] = None,\n- loop: Optional[asyncio.AbstractEventLoop] = None,\nloop_wrapper: Optional[LoopWrapper] = None,\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCLabeler\"] = None,\nstate_dispenser: Optional[\"ABCStateDispenser\"] = None,\nerror_handler: Optional[\"ABCErrorHandler\"] = None,\n- task_each_event: bool = True,\n+ task_each_event=None,\n):\nself.api: API = API(token) if token is not None else api # type: ignore\nself.error_handler = error_handler or ErrorHandler()\n@@ -43,8 +41,8 @@ class Bot(ABCFramework):\nself._polling = polling or BotPolling(self.api)\nself._callback = callback or BotCallback()\nself._router = router or Router()\n- self._loop = loop\n- self.task_each_event = task_each_event\n+ if task_each_event:\n+ logger.warning(\"task_each_event is deprecated and will be removed in future versions\")\n@property\ndef callback(self) -> \"ABCCallback\":\n@@ -81,15 +79,12 @@ class Bot(ABCFramework):\nasync for event in polling.listen():\nlogger.debug(\"New event was received: {}\", event)\nfor update in event[\"updates\"]:\n- if not self.task_each_event:\n- await self.router.route(update, polling.api)\n- else:\n- self.loop.create_task(self.router.route(update, polling.api))\n+ self.loop_wrapper.add_task(self.router.route(update, polling.api))\ndef run_forever(self) -> NoReturn: # type: ignore\nlogger.info(\"Loop will be run forever\")\nself.loop_wrapper.add_task(self.run_polling())\n- self.loop_wrapper.run_forever(self.loop)\n+ self.loop_wrapper.run()\nasync def setup_webhook(self) -> Tuple[str, str]:\n\"\"\"\n@@ -107,20 +102,9 @@ class Bot(ABCFramework):\nawait self.callback.edit_callback_server(server_id)\nelse:\nserver_id = await self.callback.add_callback_server()\n- self.loop.create_task(\n- self.callback.set_callback_settings(server_id, {\"message_new\": True})\n- )\n+ await self.callback.set_callback_settings(server_id, {\"message_new\": True})\n+\nreturn confirmation_code, secret_key\nasync def process_event(self, event: dict):\nawait self.router.route(event, self.api)\n-\n- @property\n- def loop(self) -> asyncio.AbstractEventLoop:\n- if self._loop is None:\n- self._loop = asyncio.get_event_loop()\n- return self._loop\n-\n- @loop.setter\n- def loop(self, new_loop: asyncio.AbstractEventLoop):\n- self._loop = new_loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot/multibot.py",
"new_path": "vkbottle/framework/bot/multibot.py",
"diff": "@@ -24,4 +24,4 @@ def run_multibot(\npolling = polling_type().construct(api_instance)\napi_instance.http_client = SingleAiohttpClient()\nbot.loop_wrapper.add_task(bot.run_polling(custom_polling=polling))\n- bot.loop_wrapper.run_forever()\n+ bot.loop_wrapper.run()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/multibot.py",
"new_path": "vkbottle/framework/user/multibot.py",
"diff": "@@ -24,4 +24,4 @@ def run_multibot(\npolling = polling_type().construct(api_instance)\napi_instance.http_client = SingleAiohttpClient()\nuser.loop_wrapper.add_task(user.run_polling(custom_polling=polling))\n- user.loop_wrapper.run_forever(user.loop)\n+ user.loop_wrapper.run()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user/user.py",
"new_path": "vkbottle/framework/user/user.py",
"diff": "-from asyncio import get_event_loop\n+import asyncio\nfrom typing import TYPE_CHECKING, NoReturn, Optional, Type, Union\nfrom vkbottle.api import API\n@@ -11,7 +11,6 @@ from vkbottle.polling import UserPolling\nfrom vkbottle.tools import LoopWrapper, UserAuth\nif TYPE_CHECKING:\n- from asyncio import AbstractEventLoop\nfrom vkbottle.api import ABCAPI, Token\nfrom vkbottle.dispatch import ABCRouter, ABCStateDispenser\n@@ -26,13 +25,12 @@ class User(ABCFramework):\ntoken: Optional[\"Token\"] = None,\napi: Optional[\"ABCAPI\"] = None,\npolling: Optional[\"ABCPolling\"] = None,\n- loop: Optional[\"AbstractEventLoop\"] = None,\nloop_wrapper: Optional[LoopWrapper] = None,\nrouter: Optional[\"ABCRouter\"] = None,\nlabeler: Optional[\"ABCLabeler\"] = None,\nstate_dispenser: Optional[\"ABCStateDispenser\"] = None,\nerror_handler: Optional[\"ABCErrorHandler\"] = None,\n- task_each_event: bool = True,\n+ task_each_event=None,\n):\nself.api: Union[\"ABCAPI\", API] = API(token) if token is not None else api # type: ignore\nself.error_handler = error_handler or ErrorHandler()\n@@ -41,8 +39,8 @@ class User(ABCFramework):\nself.state_dispenser = state_dispenser or BuiltinStateDispenser()\nself._polling = polling or UserPolling(self.api)\nself._router = router or Router()\n- self._loop = loop\n- self.task_each_event = task_each_event\n+ if task_each_event:\n+ logger.warning(\"task_each_event is deprecated and will be removed in future versions\")\n@property\ndef polling(self) -> \"ABCPolling\":\n@@ -73,8 +71,11 @@ class User(ABCFramework):\nclient_secret: Optional[str] = None,\n**kwargs,\n):\n- loop = get_event_loop()\n- assert not loop.is_running(), \"Event loop is already running, use direct_auth instead\"\n+ try:\n+ loop = asyncio.get_running_loop()\n+ logger.warning(\"Event loop is already running, use direct_auth instead\")\n+ except RuntimeError:\n+ loop = asyncio.new_event_loop()\nreturn loop.run_until_complete(\ncls.direct_auth(\nlogin=login,\n@@ -104,22 +105,9 @@ class User(ABCFramework):\nasync for event in polling.listen(): # type: ignore\nlogger.debug(\"New event was received: {}\", event)\nfor update in event.get(\"updates\", []):\n- if not self.task_each_event:\n- await self.router.route(update, polling.api)\n- else:\n- self.loop.create_task(self.router.route(update, polling.api))\n+ self.loop_wrapper.add_task(self.router.route(update, polling.api))\ndef run_forever(self) -> NoReturn: # type: ignore\nlogger.info(\"Loop will be run forever\")\nself.loop_wrapper.add_task(self.run_polling())\n- self.loop_wrapper.run_forever(self.loop)\n-\n- @property\n- def loop(self) -> \"AbstractEventLoop\":\n- if self._loop is None:\n- self._loop = get_event_loop()\n- return self._loop\n-\n- @loop.setter\n- def loop(self, new_loop: \"AbstractEventLoop\"):\n- self._loop = new_loop\n+ self.loop_wrapper.run()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/aiohttp.py",
"new_path": "vkbottle/http/aiohttp.py",
"diff": "@@ -3,7 +3,6 @@ from typing import TYPE_CHECKING, Any, Optional, Type, TypeVar\nfrom aiohttp import ClientSession\nfrom vkbottle.modules import json as json_module\n-from vkbottle.modules import logger\nfrom .abc import ABCHTTPClient\n@@ -28,8 +27,6 @@ class AiohttpClient(ABCHTTPClient):\nif optimize:\nsession_params[\"skip_auto_headers\"] = {\"User-Agent\"}\nsession_params[\"raise_for_status\"] = True\n- if session_params.pop(\"loop\", None):\n- logger.warning(\"loop argument is deprecated\")\nself.session = session\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/delayed_task.py",
"new_path": "vkbottle/tools/dev/delayed_task.py",
"diff": "from asyncio import sleep\n-from typing import TYPE_CHECKING, Any, Callable, Coroutine\n-\n-if TYPE_CHECKING:\n- Handler = Callable[..., Coroutine[Any, Any, Any]]\n+from typing import Any, Callable, Coroutine\nclass DelayedTask:\n- def __init__(self, seconds: int, handler: \"Handler\", do_break: bool = False):\n+ def __init__(\n+ self,\n+ seconds: int,\n+ handler: Callable[..., Coroutine[Any, Any, Any]],\n+ do_break: bool = False,\n+ ):\nself.seconds = seconds\nself.handler = handler\nself.do_break = do_break\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/loop_wrapper.py",
"new_path": "vkbottle/tools/dev/loop_wrapper.py",
"diff": "import asyncio\n-from asyncio import AbstractEventLoop, get_event_loop\n-from typing import TYPE_CHECKING, Any, Callable, Coroutine, List, NoReturn, Optional, Union\n+from asyncio import new_event_loop\n+from typing import TYPE_CHECKING, Any, Callable, Coroutine, List, Optional, Union\nfrom vkbottle.modules import logger\n@@ -9,6 +9,7 @@ from .delayed_task import DelayedTask\nif TYPE_CHECKING:\nTask = Coroutine[Any, Any, Any]\n+ from asyncio import AbstractEventLoop\nclass LoopWrapper:\n@@ -20,53 +21,61 @@ class LoopWrapper:\n*,\non_startup: Optional[List[\"Task\"]] = None,\non_shutdown: Optional[List[\"Task\"]] = None,\n- auto_reload: Optional[bool] = None,\n- auto_reload_dir: Optional[str] = None,\n+ auto_reload: bool = False,\n+ auto_reload_dir: str = \".\",\ntasks: Optional[List[\"Task\"]] = None,\n):\nself.on_startup = on_startup or []\nself.on_shutdown = on_shutdown or []\n- self.auto_reload = auto_reload or False\n- self.auto_reload_dir = auto_reload_dir or \".\"\n+ self.auto_reload = auto_reload\n+ self.auto_reload_dir = auto_reload_dir\nself.tasks = tasks or []\n+ self.loop: Optional[\"AbstractEventLoop\"] = None\n- def run_forever(self, loop: Optional[AbstractEventLoop] = None) -> NoReturn: # type: ignore\n- \"\"\"Runs startup tasks and makes the loop running forever\"\"\"\n+ def run_forever(self):\n+ \"\"\"Deprecated. Use run() instead\"\"\"\n+ logger.warning(\"run_forever is deprecated. Use run() instead\")\n+ self.run()\n+\n+ def run(self) -> None:\n+ \"\"\"Runs startup tasks and makes the loop running until all tasks are done\"\"\"\nif not self.tasks:\nlogger.warning(\"You ran loop with 0 tasks. Is it ok?\")\n- loop = loop or get_event_loop()\n+ self.loop = new_event_loop()\n- try:\n- [loop.run_until_complete(startup_task) for startup_task in self.on_startup]\n+ for startup_task in self.on_startup:\n+ self.loop.run_until_complete(startup_task)\nif self.auto_reload:\n- loop.create_task(watch_to_reload(self.auto_reload_dir))\n+ self.loop.create_task(watch_to_reload(self.auto_reload_dir))\nfor task in self.tasks:\n- loop.create_task(task)\n+ self.loop.create_task(task)\n+\n+ tasks = asyncio.all_tasks(self.loop)\n+ self.loop.run_until_complete(asyncio.gather(*tasks))\n+\n+ for shutdown_task in self.on_shutdown:\n+ self.loop.run_until_complete(shutdown_task)\n- loop.run_forever()\n- except KeyboardInterrupt:\n- logger.info(\"Keyboard Interrupt\")\n- finally:\n- [loop.run_until_complete(shutdown_task) for shutdown_task in self.on_shutdown]\n- if loop.is_running():\n- loop.close()\n+ if self.loop.is_running():\n+ self.loop.close()\ndef add_task(self, task: Union[\"Task\", Callable[..., \"Task\"]]):\n- \"\"\"Adds tasks to be ran in run_forever\n+ \"\"\"Adds tasks to be ran in run_forever or run it immediately if loop is already running\n:param task: coroutine / coroutine function with zero arguments\n\"\"\"\n-\n- if asyncio.iscoroutinefunction(task) or isinstance(task, DelayedTask): # type: ignore\n- self.tasks.append(task()) # type: ignore\n- elif asyncio.iscoroutine(task): # type: ignore\n- self.tasks.append(task) # type: ignore\n- else:\n+ if asyncio.iscoroutinefunction(task) or isinstance(task, DelayedTask):\n+ task = task()\n+ elif not asyncio.iscoroutine(task):\nraise TypeError(\"Task should be coroutine or coroutine function\")\n+ if self.loop and self.loop.is_running():\n+ self.loop.create_task(task)\n+ self.tasks.append(task)\n+\ndef interval(\nself, seconds: int = 0, minutes: int = 0, hours: int = 0, days: int = 0\n) -> Callable[[Callable], Callable]:\n@@ -75,7 +84,7 @@ class LoopWrapper:\n>>> @lw.interval(seconds=5)\n>>> async def repeated_function():\n>>> print(\"This will be logged every five seconds\")\n- >>> lw.run_forever()\n+ >>> lw.run()\n\"\"\"\nseconds += minutes * 60\n@@ -96,7 +105,7 @@ class LoopWrapper:\n>>> @lw.timer(seconds=5)\n>>> async def delayed_function():\n>>> print(\"This will after 5 seconds\")\n- >>> lw.run_forever()\n+ >>> lw.run()\n\"\"\"\nseconds += minutes * 60\nseconds += hours * 60 * 60\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/utils.py",
"new_path": "vkbottle/tools/dev/utils.py",
"diff": "@@ -17,10 +17,10 @@ T = TypeVar(\"T\")\n# This feature is not used in production\n# but can be useful for customization\n# purposes\n-def run_in_task(coroutine: Coroutine) -> None:\n+def run_in_task(coroutine: Coroutine) -> asyncio.Task:\n\"\"\"Gets loop and runs add makes task from the given coroutine\"\"\"\nloop = asyncio.get_running_loop()\n- loop.create_task(coroutine)\n+ return loop.create_task(coroutine)\ndef run_sync(coroutine: Coroutine[Any, Any, T]) -> T:\n@@ -48,9 +48,9 @@ def load_blueprints_from_package(package_name: str) -> Iterator[\"ABCBlueprint\"]:\nbp_names = re.findall(\nr\"^(\\w+) = (?:Bot|User|)Blueprint\\(\", file.read(), flags=re.MULTILINE\n)\n+\nassert len(bp_names) == 1\nbp_paths.append((filename[:-3], bp_names[0]))\n-\nfor bp_path in bp_paths:\nmodule, bp_name = bp_path\nmodule_name = package_name.replace(f\".{os.sep}\", \".\").replace(os.sep, \".\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Remove `.loop` from framework; Change `loop_wrapper` logic
|
718,844 |
18.10.2022 10:45:44
| -10,800 |
9560f4bebba66f3a745198f4366962073dff824f
|
Run CI on python3.10
|
[
{
"change_type": "MODIFY",
"old_path": ".github/workflows/ci.yml",
"new_path": ".github/workflows/ci.yml",
"diff": "@@ -17,8 +17,8 @@ jobs:\n- macos-latest\n- windows-latest\npython-version:\n- - 3.7\n- - 3.9\n+ - \"3.7\"\n+ - \"3.10\"\nsteps:\n- uses: actions/checkout@v3\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Run CI on python3.10
|
718,844 |
19.10.2022 06:39:44
| -10,800 |
02c6e045e70d250f269d24d269ed1c6eec030c2d
|
Wait for the runtime added tasks to complete
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/loop_wrapper.py",
"new_path": "vkbottle/tools/dev/loop_wrapper.py",
"diff": "import asyncio\n+import contextlib\nfrom asyncio import new_event_loop\nfrom typing import TYPE_CHECKING, Any, Callable, Coroutine, List, Optional, Union\n@@ -55,11 +56,25 @@ class LoopWrapper:\nself.loop.create_task(task)\ntasks = asyncio.all_tasks(self.loop)\n- self.loop.run_until_complete(asyncio.gather(*tasks))\n-\n+ try:\n+ while tasks:\n+ results = self.loop.run_until_complete(\n+ asyncio.gather(*tasks, return_exceptions=True)\n+ )\n+ for result in results:\n+ if not isinstance(result, Exception):\n+ continue\n+ logger.exception(result)\n+ tasks = asyncio.all_tasks(self.loop)\n+ except KeyboardInterrupt:\n+ logger.info(\"Caught keyboard interrupt. Shutting down...\")\n+ task = asyncio.gather(*tasks)\n+ task.cancel()\n+ with contextlib.suppress(asyncio.CancelledError):\n+ self.loop.run_until_complete(task)\n+ finally:\nfor shutdown_task in self.on_shutdown:\nself.loop.run_until_complete(shutdown_task)\n-\nif self.loop.is_running():\nself.loop.close()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Wait for the runtime added tasks to complete
|
718,844 |
14.11.2022 23:16:30
| -10,800 |
6268f92db21f359c8e9258f7b49e9a0eb7eaa6e8
|
Uploaders update
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/audio.py",
"new_path": "vkbottle/tools/dev/uploader/audio.py",
"diff": "@@ -13,27 +13,40 @@ class AudioUploader(BaseUploader):\nreturn (await self.api.request(\"audio.getUploadServer\", {}))[\"response\"]\nasync def upload(\n- self, artist: str, title: str, file_source: Union[str, \"Bytes\"], **params\n- ) -> Union[str, dict]:\n+ self,\n+ artist: str,\n+ title: str,\n+ file_source: Union[str, \"Bytes\"],\n+ **params,\n+ ) -> str:\n+ audio = await self.raw_upload(artist, title, file_source, **params)\n+ return self.generate_attachment_string(\n+ \"audio\",\n+ await self.get_owner_id(**params, **audio),\n+ audio[\"id\"],\n+ audio.get(\"access_key\"),\n+ )\n+\n+ async def raw_upload(\n+ self,\n+ artist: str,\n+ title: str,\n+ file_source: Union[str, \"Bytes\"],\n+ **params,\n+ ) -> dict:\nserver = await self.get_server()\ndata = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n- audio = (\n+ return (\nawait self.api.request(\n\"audio.save\",\n{\"artist\": artist, \"title\": title, **uploader, **params},\n)\n)[\"response\"]\n- if self.generate_attachment_strings:\n- return self.generate_attachment_string(\n- \"audio\", await self.get_owner_id(params), audio[\"id\"], audio.get(\"access_key\")\n- )\n- return audio\n-\n@property\ndef attachment_name(self) -> str:\nreturn self.with_name or self.NAME\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/base.py",
"new_path": "vkbottle/tools/dev/uploader/base.py",
"diff": "+import warnings\nfrom abc import ABC, abstractmethod\nfrom io import BytesIO\n-from typing import TYPE_CHECKING, Callable, Optional, Union\n+from typing import TYPE_CHECKING, Optional, Union\nimport aiofiles\n@@ -16,14 +17,18 @@ if TYPE_CHECKING:\nclass BaseUploader(ABC):\ndef __init__(\nself,\n- api: Optional[\"ABCAPI\"] = None,\n- api_getter: Optional[Callable[[], \"ABCAPI\"]] = None,\n- generate_attachment_strings: bool = True,\n+ api: \"ABCAPI\",\nwith_name: Optional[str] = None,\n+ **kwargs,\n):\n- assert api_getter is not None or api is not None, \"api or api_getter should be set\"\n- self._get_api = api_getter or (lambda: api) # type: ignore\n- self.generate_attachment_strings = generate_attachment_strings\n+ self.api = api\n+ if \"generate_attachment_strings\" in kwargs:\n+ warnings.warn(\n+ \"generate_attachment_strings in __init__ is deprecated\"\n+ \" use .raw_upload() to get raw response or .upload() to get attachment string\",\n+ DeprecationWarning,\n+ )\n+ kwargs.pop(\"generate_attachment_strings\")\nself.with_name = with_name\n@abstractmethod\n@@ -35,25 +40,23 @@ class BaseUploader(ABC):\ndef attachment_name(self) -> str:\npass\n- @property\n- def api(self) -> \"ABCAPI\":\n- return self._get_api() # type: ignore\n-\nasync def upload_files(self, upload_url: str, files: dict) -> dict:\nraw_response = await self.api.http_client.request_text(\nupload_url, method=\"POST\", data=files\n)\nreturn json.loads(raw_response)\n- def get_bytes_io(self, data: \"Bytes\", name: str = \"\") -> BytesIO:\n+\n+ def get_bytes_io(self, data: \"Bytes\", name: Optional[str] = None) -> BytesIO:\nbytes_io = data if isinstance(data, BytesIO) else BytesIO(data)\n- bytes_io.seek(0) # To avoid errors with image generators (such as pillow)\n- bytes_io.name = (\n- name or self.attachment_name\n- ) # To guarantee VK API file extension recognition\n+ # To avoid errors with image generators (such as pillow)\n+ bytes_io.seek(0)\n+ # To guarantee VK API file extension recognition\n+ if not hasattr(bytes_io, \"name\"):\n+ bytes_io.name = name or self.attachment_name\nreturn bytes_io\n- async def get_owner_id(self, upload_params: dict) -> int:\n+ async def get_owner_id(self, **upload_params) -> int:\nif \"group_id\" in upload_params:\nreturn upload_params[\"group_id\"]\nif \"user_id\" in upload_params:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/doc.py",
"new_path": "vkbottle/tools/dev/uploader/doc.py",
"diff": "-from typing import TYPE_CHECKING, Union\n+import os.path\n+from typing import TYPE_CHECKING, Optional, Union\nfrom .base import BaseUploader\n@@ -13,30 +14,45 @@ class DocUploader(BaseUploader):\nreturn (await self.api.request(\"docs.getUploadServer\", kwargs))[\"response\"]\nasync def upload(\n- self, title: str, file_source: Union[str, \"Bytes\"], **params\n- ) -> Union[str, dict]:\n- server = await self.get_server(**params)\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ group_id: Optional[int] = None,\n+ **params,\n+ ) -> str:\n+ doc = await self.raw_upload(file_source, group_id, **params)\n+ doc_type = doc[\"type\"]\n+ return self.generate_attachment_string(\n+ doc_type,\n+ doc[doc_type][\"owner_id\"],\n+ doc[doc_type][\"id\"],\n+ doc[doc_type].get(\"access_key\"),\n+ )\n+\n+ async def raw_upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ group_id: Optional[int] = None,\n+ **params,\n+ ) -> dict:\n+ title = params.pop(\"title\", None)\n+ if title is None:\n+ if isinstance(file_source, str):\n+ title = os.path.split(file_source)[1]\n+ else:\n+ title = self.NAME\n+ server = await self.get_server(group_id=group_id, **params)\ndata = await self.read(file_source)\n+\nfile = self.get_bytes_io(data, name=title)\nuploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n- doc = (\n+ return (\nawait self.api.request(\n\"docs.save\",\n{\"title\": title, **uploader, **params},\n)\n)[\"response\"]\n- doc_type = doc[\"type\"]\n-\n- if self.generate_attachment_strings:\n- return self.generate_attachment_string(\n- doc_type,\n- doc[doc_type][\"owner_id\"],\n- doc[doc_type][\"id\"],\n- doc[doc_type].get(\"access_key\"),\n- )\n- return doc\n@property\ndef attachment_name(self) -> str:\n@@ -49,6 +65,34 @@ class DocWallUploader(DocUploader):\nclass DocMessagesUploader(DocUploader):\n+ async def upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ group_id: Optional[int] = None,\n+ peer_id: Optional[int] = None,\n+ **params,\n+ ) -> str:\n+ return await super().upload(\n+ file_source=file_source,\n+ group_id=group_id,\n+ peer_id=peer_id,\n+ **params,\n+ )\n+\n+ async def raw_upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ group_id: Optional[int] = None,\n+ peer_id: Optional[int] = None,\n+ **params,\n+ ) -> dict:\n+ return await super().raw_upload(\n+ file_source=file_source,\n+ group_id=group_id,\n+ peer_id=peer_id,\n+ **params,\n+ )\n+\nasync def get_server(self, **kwargs) -> dict:\nreturn (await self.api.request(\"docs.getMessagesUploadServer\", kwargs))[\"response\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/photo.py",
"new_path": "vkbottle/tools/dev/uploader/photo.py",
"diff": "-from typing import TYPE_CHECKING, List, Union\n+import warnings\n+from typing import TYPE_CHECKING, List, Optional, Union\nfrom .base import BaseUploader\n@@ -16,12 +17,40 @@ class PhotoUploader(BaseUploader):\nclass PhotoToAlbumUploader(PhotoUploader):\nasync def upload(\n- self, album_id: int, paths_like: Union[List[Union[str, \"Bytes\"]], str, \"Bytes\"], **params\n- ) -> Union[str, List[Union[str, dict]]]:\n+ self,\n+ album_id: int,\n+ paths_like: Union[List[Union[str, \"Bytes\"]], str, \"Bytes\"],\n+ group_id: Optional[int] = None,\n+ **params,\n+ ) -> List[str]:\n+ photos = await self.raw_upload(\n+ album_id=album_id,\n+ paths_like=paths_like,\n+ group_id=group_id,\n+ **params,\n+ )\n+ return [\n+ self.generate_attachment_string(\n+ \"photo\",\n+ photo[\"owner_id\"],\n+ photo[\"id\"],\n+ photo.get(\"access_key\"),\n+ )\n+ for photo in photos\n+ ]\n+\n+ async def raw_upload(\n+ self,\n+ album_id: int,\n+ paths_like: Union[List[Union[str, \"Bytes\"]], str, \"Bytes\"],\n+ group_id: Optional[int] = None,\n+ **params,\n+ ) -> List[dict]:\nif not isinstance(paths_like, list):\npaths_like = [paths_like]\n-\n- server = await self.get_server(album_id=album_id, **params)\n+ if len(paths_like) > 5:\n+ raise ValueError(\"You can upload up to 5 photos at once\")\n+ server = await self.get_server(album_id=album_id, group_id=group_id, **params)\nfiles = {}\nfor i, file_source in enumerate(paths_like):\n@@ -29,26 +58,40 @@ class PhotoToAlbumUploader(PhotoUploader):\nfiles[f\"file{i+1}\"] = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], files)\n- photos = (\n+ return (\nawait self.api.request(\"photos.save\", {\"album_id\": album_id, **uploader, **params})\n)[\"response\"]\n- if self.generate_attachment_strings:\n- return [\n- self.generate_attachment_string(\n- \"photo\", photo[\"owner_id\"], photo[\"id\"], photo.get(\"access_key\")\n- )\n- for photo in photos\n- ]\n- return photos\n-\nasync def get_server(self, **kwargs) -> dict:\nreturn (await self.api.request(\"photos.getUploadServer\", kwargs))[\"response\"]\nclass PhotoWallUploader(PhotoUploader):\n- async def upload(self, file_source: Union[str, \"Bytes\"], **params) -> Union[str, List[dict]]:\n- server = await self.get_server(**params)\n+ async def upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ group_id: Optional[int] = None,\n+ **params,\n+ ) -> str:\n+ photo = await self.raw_upload(\n+ file_source=file_source,\n+ group_id=group_id,\n+ **params,\n+ )\n+ return self.generate_attachment_string(\n+ \"photo\",\n+ photo[\"owner_id\"],\n+ photo[\"id\"],\n+ photo.get(\"access_key\"),\n+ )\n+\n+ async def raw_upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ group_id: Optional[int] = None,\n+ **params,\n+ ) -> dict:\n+ server = await self.get_server(group_id=group_id, **params)\ndata = await self.read(file_source)\nfile = self.get_bytes_io(data)\n@@ -57,82 +100,164 @@ class PhotoWallUploader(PhotoUploader):\n\"response\"\n]\n- if self.generate_attachment_strings:\n- return self.generate_attachment_string(\n- \"photo\", photos[0][\"owner_id\"], photos[0][\"id\"], photos[0].get(\"access_key\")\n- )\n- return photos\n+ return photos[0]\nasync def get_server(self, **kwargs) -> dict:\nreturn (await self.api.request(\"photos.getWallUploadServer\", {}))[\"response\"]\nclass PhotoFaviconUploader(PhotoUploader):\n- async def upload(self, file_source: Union[str, \"Bytes\"], **params) -> Union[str, dict]:\n- owner_id = await self.get_owner_id(params)\n+ async def upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ owner_id: Optional[int] = None,\n+ **params,\n+ ) -> str:\n+ owner_id = owner_id or await self.get_owner_id(**params)\n+ photo = await self.raw_upload(\n+ file_source=file_source,\n+ owner_id=owner_id,\n+ **params,\n+ )\n+ return self.generate_attachment_string(\n+ \"wall\",\n+ owner_id,\n+ photo[\"post_id\"],\n+ photo.get(\"access_key\"),\n+ )\n+\n+ async def raw_upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ owner_id: Optional[int] = None,\n+ **params,\n+ ) -> dict:\n+ owner_id = owner_id or await self.get_owner_id(**params)\nserver = await self.get_server(owner_id=owner_id)\ndata = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n- photo = (await self.api.request(\"photos.saveOwnerPhoto\", {**uploader, **params}))[\n+ return (await self.api.request(\"photos.saveOwnerPhoto\", {**uploader, **params}))[\n\"response\"\n]\n- if self.generate_attachment_strings:\n- return self.generate_attachment_string(\n- \"wall\", owner_id, photo[\"post_id\"], photo.get(\"access_key\")\n- )\n- return photo\n-\nasync def get_server(self, **kwargs) -> dict:\nreturn (await self.api.request(\"photos.getOwnerPhotoUploadServer\", kwargs))[\"response\"]\nclass PhotoMessageUploader(PhotoUploader):\n- async def upload(self, file_source: Union[str, \"Bytes\"], **params) -> Union[str, List[dict]]:\n- server = await self.get_server(**params)\n+ async def upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ peer_id: Optional[int] = None,\n+ **params,\n+ ) -> str:\n+ photo = await self.raw_upload(\n+ file_source=file_source,\n+ peer_id=peer_id,\n+ **params,\n+ )\n+ return self.generate_attachment_string(\n+ \"photo\",\n+ photo[\"owner_id\"],\n+ photo[\"id\"],\n+ photo.get(\"access_key\"),\n+ )\n+\n+ async def raw_upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ peer_id: Optional[int] = None,\n+ **params,\n+ ) -> dict:\n+ server = await self.get_server(peer_id=peer_id, **params)\ndata = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n- photo = (await self.api.request(\"photos.saveMessagesPhoto\", {**uploader, **params}))[\n+ return (await self.api.request(\"photos.saveMessagesPhoto\", {**uploader, **params},))[\n\"response\"\n- ]\n-\n- if self.generate_attachment_strings:\n- return self.generate_attachment_string(\n- \"photo\", photo[0][\"owner_id\"], photo[0][\"id\"], photo[0].get(\"access_key\")\n- )\n- return photo\n+ ][0]\nasync def get_server(self, **kwargs) -> dict:\nreturn (await self.api.request(\"photos.getMessagesUploadServer\", kwargs))[\"response\"]\nclass PhotoChatFaviconUploader(PhotoUploader):\n- async def upload(self, chat_id: int, file_source: Union[str, \"Bytes\"], **params) -> str:\n- server = await self.get_server(chat_id=chat_id, **params)\n+ async def upload(\n+ self,\n+ **params,\n+ ) -> str:\n+ warnings.warn(\n+ \"Chat favicon upload doesn't return attachment string. Use .raw_upload() instead\",\n+ Warning,\n+ )\n+ await self.raw_upload(**params)\n+ return \"\"\n+\n+ async def raw_upload(\n+ self,\n+ chat_id: int,\n+ file_source: Union[str, \"Bytes\"],\n+ crop_x: Optional[int] = None,\n+ crop_y: Optional[int] = None,\n+ crop_width: Optional[int] = None,\n+ **params,\n+ ) -> dict:\n+ server = await self.get_server(\n+ chat_id=chat_id,\n+ crop_x=crop_x,\n+ crop_y=crop_y,\n+ crop_width=crop_width,\n+ **params,\n+ )\ndata = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"photo\": file})\n- return uploader[\"response\"]\n+ return await self.api.request(\n+ \"photos.setChatPhoto\", {\"file\": uploader[\"response\"], **params}\n+ )\nasync def get_server(self, **kwargs) -> dict:\nreturn (await self.api.request(\"photos.getChatUploadServer\", kwargs))[\"response\"]\nclass PhotoMarketUploader(PhotoUploader):\n- async def upload(self, file_source: Union[str, \"Bytes\"], **params) -> dict:\n- server = await self.get_server(**params)\n+ async def upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ group_id: int,\n+ **params,\n+ ) -> str:\n+ photo = await self.raw_upload(\n+ file_source=file_source,\n+ group_id=group_id,\n+ **params,\n+ )\n+ return self.generate_attachment_string(\n+ \"photo\",\n+ photo[\"owner_id\"],\n+ photo[\"id\"],\n+ photo.get(\"access_key\"),\n+ )\n+\n+ async def raw_upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ group_id: int,\n+ **params,\n+ ) -> dict:\n+ server = await self.get_server(group_id=group_id, **params)\ndata = await self.read(file_source)\nfile = self.get_bytes_io(data)\nuploader = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n- return (await self.api.request(\"photos.saveMarketPhoto\", {**uploader, **params}))[\n- \"response\"\n- ]\n+ return await self.api.request(\n+ \"photos.saveMarketPhoto\",\n+ {**uploader, **params},\n+ )\nasync def get_server(self, **kwargs) -> dict:\nreturn (await self.api.request(\"photos.getMarketUploadServer\", kwargs))[\"response\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/video.py",
"new_path": "vkbottle/tools/dev/uploader/video.py",
"diff": "-from typing import TYPE_CHECKING, List, Optional, Union\n+from typing import TYPE_CHECKING, Optional, Union\nfrom .base import BaseUploader\n@@ -16,26 +16,84 @@ class VideoUploader(BaseUploader):\nasync def upload(\nself,\nfile_source: Optional[Union[str, \"Bytes\"]] = None,\n+ link: Optional[str] = None,\n+ name: Optional[str] = None,\n+ description: Optional[str] = None,\n+ is_private: Optional[bool] = None,\n+ wallpost: Optional[bool] = None,\ngroup_id: Optional[int] = None,\n+ album_id: Optional[int] = None,\n+ privacy_view: Optional[list] = None,\n+ privacy_comment: Optional[list] = None,\n+ no_comments: Optional[bool] = None,\n+ repeat: Optional[bool] = None,\n+ compression: Optional[bool] = None,\n**params,\n- ) -> Union[str, List[dict], dict]:\n- server = await self.get_server(group_id=group_id)\n- assert (\n- file_source is not None or \"link\" in params\n- ), \"file_source or link to video must be set\"\n-\n- if \"link\" in params and not file_source:\n- return await self.api.http_client.request_json(\n- server[\"upload_url\"], method=\"GET\", params=params\n+ ) -> str:\n+ server = await self.raw_upload(\n+ file_source=file_source,\n+ link=link,\n+ name=name,\n+ description=description,\n+ is_private=is_private,\n+ wallpost=wallpost,\n+ group_id=group_id,\n+ album_id=album_id,\n+ privacy_view=privacy_view,\n+ privacy_comment=privacy_comment,\n+ no_comments=no_comments,\n+ repeat=repeat,\n+ compression=compression,\n+ **params,\n+ )\n+ return self.generate_attachment_string(\n+ \"video\",\n+ server[\"owner_id\"],\n+ server[\"video_id\"],\n+ )\n+\n+ async def raw_upload(\n+ self,\n+ file_source: Optional[Union[str, \"Bytes\"]] = None,\n+ link: Optional[str] = None,\n+ name: Optional[str] = None,\n+ description: Optional[str] = None,\n+ is_private: Optional[bool] = None,\n+ wallpost: Optional[bool] = None,\n+ group_id: Optional[int] = None,\n+ album_id: Optional[int] = None,\n+ privacy_view: Optional[list] = None,\n+ privacy_comment: Optional[list] = None,\n+ no_comments: Optional[bool] = None,\n+ repeat: Optional[bool] = None,\n+ compression: Optional[bool] = None,\n+ **params,\n+ ) -> dict:\n+ server = await self.get_server(\n+ group_id=group_id,\n+ album_id=album_id,\n+ name=name,\n+ description=description,\n+ is_private=is_private,\n+ wallpost=wallpost,\n+ link=link,\n+ privacy_view=privacy_view,\n+ privacy_comment=privacy_comment,\n+ no_comments=no_comments,\n+ repeat=repeat,\n+ compression=compression,\n)\n+ if file_source is None and link is None:\n+ raise ValueError(\"You must specify either file_source or link\")\n+ if link:\n+ await self.api.http_client.request_json(server[\"upload_url\"], method=\"GET\")\n+ else:\ndata = await self.read(file_source) # type: ignore\nfile = self.get_bytes_io(data)\n- video = await self.upload_files(server[\"upload_url\"], {\"video_file\": file})\n+ await self.upload_files(server[\"upload_url\"], {\"video_file\": file}, **params)\n- if self.generate_attachment_strings:\n- return self.generate_attachment_string(\"video\", video[\"owner_id\"], video[\"video_id\"])\n- return video\n+ return server\nasync def get_server(self, **kwargs) -> dict:\nreturn (await self.api.request(\"video.save\", kwargs))[\"response\"]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Uploaders update (#568)
|
718,844 |
14.11.2022 23:23:11
| -10,800 |
0bbb64a017e979abccc558e3b5600ccffc6fdcd6
|
Fix E303 error
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/base.py",
"new_path": "vkbottle/tools/dev/uploader/base.py",
"diff": "@@ -46,7 +46,6 @@ class BaseUploader(ABC):\n)\nreturn json.loads(raw_response)\n-\ndef get_bytes_io(self, data: \"Bytes\", name: Optional[str] = None) -> BytesIO:\nbytes_io = data if isinstance(data, BytesIO) else BytesIO(data)\n# To avoid errors with image generators (such as pillow)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix E303 error
|
718,880 |
26.11.2022 02:11:16
| -10,800 |
58c5dfa963fbabdbfca3b746e8b2067f241f378d
|
Keyboard generator improvements
|
[
{
"change_type": "MODIFY",
"old_path": "tests/tools/test_tools.py",
"new_path": "tests/tools/test_tools.py",
"diff": "@@ -79,9 +79,11 @@ def assert_rule(res, rev=False):\ndef test_keyboard_non_builder():\nkeyboard = Keyboard(one_time=True)\n+ keyboard.row() # test empty row autoremove\nkeyboard.add(Text(\"I love nuggets\", {\"love\": \"nuggets\"}))\nkeyboard.row()\nkeyboard.add(Callback(\"Eat nuggets\", {\"eat\": \"nuggets\"}), color=KeyboardButtonColor.POSITIVE)\n+ keyboard.row() # test empty row autoremove\nassert keyboard.get_json() == KEYBOARD_JSON\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/keyboard/keyboard.py",
"new_path": "vkbottle/tools/dev/keyboard/keyboard.py",
"diff": "-from typing import TYPE_CHECKING, List, Optional\n+from typing import TYPE_CHECKING, List, Optional, Union\nfrom vkbottle.modules import json\n@@ -14,10 +14,9 @@ class Keyboard:\nself.one_time = one_time\nself.inline = inline\nself.buttons: List[List[KeyboardButton]] = []\n+ self.expect_new_line = True\ndef row(self) -> \"Keyboard\":\n- if len(self.buttons) and not len(self.buttons[-1]):\n- raise RuntimeError(\"Last row is empty!\")\nself.buttons.append([])\nreturn self\n@@ -38,17 +37,15 @@ class Keyboard:\nreturn self\ndef get_json(self) -> str:\n- data = json.dumps(\n+ buttons = [[button.get_data() for button in row] for row in self.buttons if row]\n+ data: Union[str, bytes] = json.dumps(\n{\n\"one_time\": self.one_time,\n\"inline\": self.inline,\n- \"buttons\": [[button.get_data() for button in row] for row in self.buttons],\n+ \"buttons\": buttons,\n}\n)\n-\n- if isinstance(data, bytes):\n- return data.decode(\"utf-8\")\n- return data.encode(\"utf-8\").decode(\"utf-8\")\n+ return data.decode() if isinstance(data, bytes) else data\ndef __str__(self) -> str:\nreturn self.get_json()\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Keyboard generator improvements (#595)
Co-authored-by: FeeeeK <26704473+FeeeeK@users.noreply.github.com>
|
718,844 |
27.11.2022 19:05:20
| -10,800 |
2d0765fec7db612bab7b7943ba86dec0e8e3d611
|
Remove not working auto reload feature
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -46,7 +46,6 @@ choicelib = \"^0.1.5\"\npydantic = \"^1.9.1\"\nvbml = \"^1.1.post1\"\nvkbottle-types = \"^5.131.146.9\"\n-watchfiles = \">=0.15,<0.19\"\naiofiles = \">=0.8,<22.2\"\ntyping-extensions = \"^4.3.0\"\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/tools/dev/auto_reload.py",
"new_path": null,
"diff": "-import os\n-import sys\n-\n-from watchfiles import awatch\n-\n-from vkbottle.modules import logger\n-\n-_startup_cwd = os.getcwd()\n-\n-\n-def restart():\n- \"\"\"https://github.com/cherrypy/cherrypy/blob/0857fa81eb0ab647c7b59a019338bab057f7748b/cherrypy/process/wspbus.py#L305\"\"\"\n- args = sys.argv[:]\n- logger.debug(\"Restarting: {}\", \" \".join(args))\n- args.insert(0, sys.executable)\n- if sys.platform == \"win32\":\n- args = ['\"%s\"' % arg for arg in args]\n-\n- os.chdir(_startup_cwd)\n- os.execv(sys.executable, args)\n-\n-\n-async def watch_to_reload(check_dir: str):\n- \"\"\"\n- Coro which see changes in your code and restart him.\n- :return:\n- \"\"\"\n- async for _ in awatch(check_dir):\n- logger.info(\"Changes were found. Restarting...\")\n- restart()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/loop_wrapper.py",
"new_path": "vkbottle/tools/dev/loop_wrapper.py",
"diff": "import asyncio\nimport contextlib\n+import warnings\nfrom asyncio import new_event_loop\nfrom typing import TYPE_CHECKING, Any, Callable, Coroutine, List, Optional, Union\nfrom vkbottle.modules import logger\n-from .auto_reload import watch_to_reload\nfrom .delayed_task import DelayedTask\nif TYPE_CHECKING:\n@@ -17,19 +17,17 @@ class LoopWrapper:\n\"\"\"Loop Wrapper for vkbottle manages startup, shutdown and main tasks,\ncreates loop and runs it forever\"\"\"\n+ auto_reload = None\n+\ndef __init__(\nself,\n*,\non_startup: Optional[List[\"Task\"]] = None,\non_shutdown: Optional[List[\"Task\"]] = None,\n- auto_reload: bool = False,\n- auto_reload_dir: str = \".\",\ntasks: Optional[List[\"Task\"]] = None,\n):\nself.on_startup = on_startup or []\nself.on_shutdown = on_shutdown or []\n- self.auto_reload = auto_reload\n- self.auto_reload_dir = auto_reload_dir\nself.tasks = tasks or []\nself.loop: Optional[\"AbstractEventLoop\"] = None\n@@ -50,7 +48,10 @@ class LoopWrapper:\nself.loop.run_until_complete(startup_task)\nif self.auto_reload:\n- self.loop.create_task(watch_to_reload(self.auto_reload_dir))\n+ warnings.warn(\n+ \"auto_reload is deprecated, instead, install watchfiles\",\n+ DeprecationWarning,\n+ )\nfor task in self.tasks:\nself.loop.create_task(task)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Remove not working auto reload feature
|
718,844 |
27.11.2022 19:15:48
| -10,800 |
2ddc52d29cbbc15c8f92067751099f682ac80aa0
|
Add new mypy rule
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "@@ -98,6 +98,7 @@ ignore_missing_imports = true\nwarn_no_return = false\nwarn_return_any = false\nwarn_unused_configs = true\n+check_untyped_defs = true\n[[tool.mypy.overrides]]\n# Ignore tests, because we can use fixtures that not quite represent a real type\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/bot.py",
"new_path": "vkbottle/framework/labeler/bot.py",
"diff": "@@ -77,11 +77,10 @@ class BotLabeler(BaseLabeler):\n\"(https://vkbottle.readthedocs.io/ru/latest/high-level/routing/rules/)\"\n)\n- if not isinstance(event, list):\n- event = [event]\n+ event_types = event if isinstance(event, list) else [event]\ndef decorator(func):\n- for e in event:\n+ for e in event_types:\nif isinstance(e, str):\ne = GroupEventType(e)\nhandler_basement = BotHandlerBasement(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/labeler/user.py",
"new_path": "vkbottle/framework/labeler/user.py",
"diff": "@@ -78,11 +78,10 @@ class UserLabeler(BaseLabeler):\n\"(https://vkbottle.readthedocs.io/ru/latest/high-level/routing/rules/)\"\n)\n- if not isinstance(event, list):\n- event = [event]\n+ event_types = [event] if isinstance(event, (int, UserEventType)) else event\ndef decorator(func):\n- for e in event:\n+ for e in event_types:\nif isinstance(e, int):\ne = UserEventType(e)\nhandler_basement = UserHandlerBasement(\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add new mypy rule
|
718,844 |
27.11.2022 22:24:32
| -10,800 |
37ed9261e7fbdcb98371010a2ed11b824d33c8db
|
Remove deprecated `keyboard_gen`
|
[
{
"change_type": "MODIFY",
"old_path": "tests/tools/test_tools.py",
"new_path": "tests/tools/test_tools.py",
"diff": "@@ -20,7 +20,6 @@ from vkbottle.tools import (\nLoopWrapper,\nTemplateElement,\nText,\n- keyboard_gen,\nload_blueprints_from_package,\nrun_in_task,\ntemplate_gen,\n@@ -97,26 +96,6 @@ def test_keyboard_builder():\n) == KEYBOARD_JSON\n-def test_keyboard_generator():\n- with pytest.deprecated_call():\n- assert json.loads(\n- keyboard_gen(\n- [\n- [{\"label\": \"I love nuggets\", \"payload\": {\"love\": \"nuggets\"}}],\n- [\n- {\n- \"type\": \"callback\",\n- \"label\": \"Eat nuggets\",\n- \"payload\": {\"eat\": \"nuggets\"},\n- \"color\": \"positive\",\n- }\n- ],\n- ],\n- one_time=True,\n- )\n- ) == json.loads(KEYBOARD_JSON)\n-\n-\ndef test_bp_importer(mocker: MockerFixture):\nrequired_files = [\"bp1.py\", \"bp2.py\", \"bp3.py\", \"bp4.py\"]\nmain_package = os.path.join(\"src\", \"folder\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -96,7 +96,6 @@ from .tools import (\nVKApps,\nVKPay,\nVoiceMessageUploader,\n- keyboard_gen,\nload_blueprints_from_package,\nrun_in_task,\nrun_sync,\n@@ -198,7 +197,6 @@ __all__ = (\n\"VideoUploader\",\n\"VoiceMessageUploader\",\n\"get_token_generator\",\n- \"keyboard_gen\",\n\"load_blueprints_from_package\",\n\"run_in_task\",\n\"run_multibot\",\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/__init__.py",
"new_path": "vkbottle/tools/__init__.py",
"diff": "@@ -43,7 +43,6 @@ from .dev import (\ntemplate_gen,\nvkscript,\n)\n-from .production import keyboard_gen\nfrom .validator import ABCValidator, CallableValidator, EqualsValidator, IsInstanceValidator\n__all__ = (\n@@ -89,7 +88,6 @@ __all__ = (\n\"VKPay\",\n\"VideoUploader\",\n\"VoiceMessageUploader\",\n- \"keyboard_gen\",\n\"load_blueprints_from_package\",\n\"run_in_task\",\n\"run_sync\",\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/tools/production/__init__.py",
"new_path": null,
"diff": "-from .legacies import keyboard_gen\n-\n-__all__ = (\"keyboard_gen\",)\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/tools/production/legacies/__init__.py",
"new_path": null,
"diff": "-from .keyboard_generator import keyboard_gen\n-\n-__all__ = (\"keyboard_gen\",)\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/tools/production/legacies/keyboard_generator.py",
"new_path": null,
"diff": "-from typing import List\n-from warnings import warn\n-\n-from vkbottle.modules import json\n-\n-\n-def keyboard_gen( # noqa: CCR001\n- pattern: List[List[dict]],\n- one_time: bool = False,\n- inline: bool = False,\n-):\n- \"\"\"Simple keyboard generator\n- :param pattern: Keyboard simple pattern, check github readme\n- :param one_time: Should keyboard be hidden after first use?\n- :param inline: Should keyboard be inline?\n- :return: VK Api Keyboard JSON\n- \"\"\"\n- warn(\n- \"keyboard_gen is deprecated and will be removed in v4.4, use Keyboard instead\",\n- DeprecationWarning,\n- )\n-\n- rows = pattern\n- buttons = []\n-\n- for row in rows:\n- row_buttons = []\n- for button in row:\n- fields = {}\n-\n- action = {\"type\": button.get(\"type\", \"text\")}\n- action.update({k: v for k, v in button.items() if k not in (\"type\", \"text\", \"color\")})\n-\n- if action[\"type\"] == \"text\":\n- action[\"label\"] = button.get(\"text\", button.get(\"label\"))\n-\n- if button.get(\"color\"):\n- fields[\"color\"] = button[\"color\"]\n-\n- row_button = {\"action\": action, **fields}\n-\n- row_buttons.append(row_button)\n- buttons.append(row_buttons)\n-\n- return str(json.dumps({\"one_time\": one_time, \"inline\": inline, \"buttons\": buttons}))\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Remove deprecated `keyboard_gen`
|
718,844 |
14.12.2022 01:01:07
| -10,800 |
f0ade96c442f03d5ca693a9dfeeaeedf709fbfdf
|
Fix states compare
|
[
{
"change_type": "MODIFY",
"old_path": "examples/high-level/labeler_setup.py",
"new_path": "examples/high-level/labeler_setup.py",
"diff": "@@ -53,8 +53,8 @@ bot.labeler.load(BotLabeler()) # Labeler can be loaded in another labeler\n# The comments for states are skipped because\n# we have another topic of the example\nclass SpamState(BaseStateGroup):\n- GOOD = 1\n- BAD = 2\n+ GOOD = \"good\"\n+ BAD = \"bad\"\n# Lets add some handlers\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/high-level/state_dispenser.py",
"new_path": "examples/high-level/state_dispenser.py",
"diff": "@@ -13,8 +13,8 @@ bot = Bot(os.environ[\"token\"])\n# Let's make a group of states\n# State group is IntEnum\nclass MenuState(BaseStateGroup):\n- START = 1\n- INFO = 2\n+ START = \"start\"\n+ INFO = \"info\"\n# <state = None> handles all events with no state;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/test_bot.py",
"new_path": "tests/test_bot.py",
"diff": "@@ -73,11 +73,11 @@ EXAMPLE_EVENT = {\nclass FirstMockState(BaseStateGroup):\n- MOCK = 1\n+ MOCK = \"mock\"\nclass SecondMockState(BaseStateGroup):\n- MOCK = 1\n+ MOCK = \"mock\"\nclass MessagesCategory(BaseCategory):\n@@ -281,3 +281,13 @@ async def test_rules(api: API):\nsg_mock_message.state_peer = StatePeer(peer_id=1, state=FirstMockState.MOCK, payload={})\nassert await base.StateGroupRule(state_group=FirstMockState).check(sg_mock_message)\nassert not await base.StateGroupRule(state_group=SecondMockState).check(sg_mock_message)\n+\n+\n+def test_states():\n+ first_mock_state = StatePeer(peer_id=1, state=FirstMockState.MOCK)\n+ second_mock_state = StatePeer(peer_id=1, state=SecondMockState.MOCK)\n+ assert FirstMockState.MOCK == SecondMockState.MOCK\n+ assert first_mock_state.state != second_mock_state.state\n+ assert first_mock_state.state == FirstMockState.MOCK\n+ assert first_mock_state.state != \"SecondMockState:mock\"\n+ assert first_mock_state.state == \"FirstMockState:mock\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/dispatch/dispenser/base.py",
"new_path": "vkbottle/dispatch/dispenser/base.py",
"diff": "@@ -5,13 +5,21 @@ from pydantic import BaseModel, validator\nclass BaseStateGroup(str, Enum):\n- pass\n+ def __str__(self) -> str:\n+ return get_state_repr(self)\ndef get_state_repr(state: BaseStateGroup) -> str:\nreturn f\"{state.__class__.__name__}:{state.value}\"\n+class StateRepresentation(str):\n+ def __eq__(self, __x: object) -> bool:\n+ if isinstance(__x, BaseStateGroup):\n+ return self == get_state_repr(__x)\n+ return super().__eq__(__x)\n+\n+\nclass StatePeer(BaseModel):\npeer_id: int\nstate: str\n@@ -20,7 +28,7 @@ class StatePeer(BaseModel):\n@validator(\"state\", pre=True)\ndef validate_state(cls, v: Any) -> str:\nif isinstance(v, BaseStateGroup):\n- return get_state_repr(v)\n+ return StateRepresentation(v)\nelif isinstance(v, str):\nreturn v\nraise ValueError(f\"State value must be `string` or `BaseStateGroup`, got `{type(v)}`\")\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix states compare
|
718,844 |
14.12.2022 01:03:45
| -10,800 |
5aa8464363d5ca08dbc98eb0c8054d4e00736fbb
|
Remove swear error handler
|
[
{
"change_type": "MODIFY",
"old_path": "tests/test_exception_handling.py",
"new_path": "tests/test_exception_handling.py",
"diff": "import pytest\n-from vkbottle import CodeException, ErrorHandler, swear\n+from vkbottle import CodeException, ErrorHandler\ndef test_code_error():\n@@ -17,23 +17,6 @@ def test_code_error():\nassert e.code == 1\n-def test_swear_sync():\n- def sync_exception_handler(e: Exception, a):\n- assert isinstance(e, RuntimeError)\n- return a\n-\n- @swear(RuntimeError, just_return=True)\n- def sync_just_return(a):\n- raise RuntimeError(f\"Error#{a}\")\n-\n- @swear(RuntimeError, exception_handler=sync_exception_handler)\n- def sync_with_exc_handler(a):\n- raise RuntimeError(f\"Error#{a}\")\n-\n- assert sync_just_return(2)\n- assert sync_with_exc_handler(3) == 3\n-\n-\n@pytest.mark.asyncio\nasync def test_error_handler():\nclass Base(Exception):\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/test_exception_manager.py",
"new_path": "tests/test_exception_manager.py",
"diff": "-from vkbottle import CodeException, swear\n+from vkbottle import CodeException\ndef test_code_exception():\n@@ -13,20 +13,3 @@ def test_code_exception():\nraise AssertionError() from e\nexcept CodeError[1, 2, 5] as e:\nassert e.code == 1\n-\n-\n-def test_swear_sync():\n- def sync_exception_handler(e: Exception, a):\n- assert isinstance(e, RuntimeError)\n- return a\n-\n- @swear(RuntimeError, just_return=True)\n- def sync_just_return(a):\n- raise RuntimeError(f\"Error#{a}\")\n-\n- @swear(RuntimeError, exception_handler=sync_exception_handler)\n- def sync_with_exc_handler(a):\n- raise RuntimeError(f\"Error#{a}\")\n-\n- assert sync_just_return(2)\n- assert sync_with_exc_handler(3) == 3\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -40,7 +40,6 @@ from .exception_factory import (\nCodeException,\nErrorHandler,\nVKAPIError,\n- swear,\n)\nfrom .framework import (\nABCBlueprint,\n@@ -201,7 +200,6 @@ __all__ = (\n\"run_in_task\",\n\"run_multibot\",\n\"run_sync\",\n- \"swear\",\n\"template_gen\",\n\"vkscript\",\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/exception_factory/__init__.py",
"new_path": "vkbottle/exception_factory/__init__.py",
"diff": "from .base_exceptions import CaptchaError, VKAPIError\nfrom .code_exception import CodeException\nfrom .error_handler import ABCErrorHandler, ErrorHandler\n-from .swear_handler import swear\n__all__ = (\n\"ABCErrorHandler\",\n@@ -9,5 +8,4 @@ __all__ = (\n\"CodeException\",\n\"ErrorHandler\",\n\"VKAPIError\",\n- \"swear\",\n)\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/exception_factory/swear_handler/__init__.py",
"new_path": null,
"diff": "-from .swear_handler import swear\n-\n-__all__ = (\"swear\",)\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/exception_factory/swear_handler/swear_handler.py",
"new_path": null,
"diff": "-import traceback\n-from inspect import iscoroutinefunction\n-from typing import Any, Callable, Optional, Tuple, Type, Union\n-\n-from vkbottle.modules import logger\n-\n-EXCEPTION = Union[Exception, Type[Exception]]\n-\n-\n-def swear(\n- exception: Union[EXCEPTION, Tuple[EXCEPTION, ...]],\n- exception_handler: Optional[Callable] = None,\n- just_log: bool = False,\n- just_return: bool = False,\n-) -> Any:\n- \"\"\"Swear catcher allows to handle exceptions | Used as a decorator\n- :param exception: Exception(s) to handle\n- :param exception_handler: async exception handler\n- :param just_log: should swear handler log the error\n- :param just_return: should the exception just be returned\n- >>> @swear(RuntimeError, just_return=True)\n- >>> def function():\n- >>> raise RuntimeError(\"Oh no!\")\n- >>> function()\n- >>> RuntimeError(\"Oh no!\")\n- \"\"\"\n-\n- if not isinstance(exception, tuple):\n- exception = (exception,)\n-\n- def decorator(func: Callable):\n- async def asynchronous_wrapper(*args, **kwargs):\n- try:\n- return await func(*args, **kwargs)\n- except exception as e:\n- if exception_handler is not None:\n- return await exception_handler(e, *args, **kwargs)\n- elif just_log:\n- logger.error(\n- \"{} (handling with swear) has thrown an exception: \\n\\n{}\",\n- func.__name__,\n- traceback.format_exc(),\n- )\n- elif just_return:\n- return e\n- finally:\n- logger.debug(\"Function {} was handled with swear\", func.__name__)\n-\n- def synchronous_wrapper(*args, **kwargs):\n- try:\n- return func(*args, **kwargs)\n- except exception as e:\n- if exception_handler is not None:\n- return exception_handler(e, *args, **kwargs)\n- elif just_log:\n- logger.error(\n- \"{} (handling with swear) has thrown an exception: \\n\\n{}\",\n- func.__name__,\n- traceback.format_exc(),\n- )\n- elif just_return:\n- return e\n- finally:\n- logger.debug(\"Function {} was handled with swear\", func.__name__)\n-\n- if iscoroutinefunction(func) and iscoroutinefunction(exception_handler):\n- return asynchronous_wrapper\n- return synchronous_wrapper\n-\n- return decorator\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Remove swear error handler
|
718,844 |
05.01.2023 19:46:45
| -10,800 |
aaf30fe5ba2a7ca8aba1978056d039b00d914f2a
|
Fix `TimeoutError` in polling
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/bot_polling.py",
"new_path": "vkbottle/polling/bot_polling.py",
"diff": "+import asyncio\nfrom typing import TYPE_CHECKING, AsyncGenerator, Optional\n-from aiohttp.client_exceptions import ServerConnectionError\n+from aiohttp.client_exceptions import ClientConnectionError\nfrom vkbottle.exception_factory import ErrorHandler\nfrom vkbottle.modules import logger\n@@ -33,6 +34,7 @@ class BotPolling(ABCPolling):\nself.stop = False\nasync def get_event(self, server: dict) -> dict:\n+ # sourcery skip: use-fstring-for-formatting\nlogger.debug(\"Making long request to get event with longpoll...\")\nreturn await self.api.http_client.request_json(\n\"{}?act=a_check&key={}&ts={}&wait={}&rps_delay={}\".format(\n@@ -49,9 +51,12 @@ class BotPolling(ABCPolling):\nlogger.debug(\"Getting polling server...\")\nif self.group_id is None:\nself.group_id = (await self.api.request(\"groups.getById\", {}))[\"response\"][0][\"id\"]\n- return (await self.api.request(\"groups.getLongPollServer\", {\"group_id\": self.group_id}))[\n- \"response\"\n- ]\n+ return (\n+ await self.api.request(\n+ \"groups.getLongPollServer\",\n+ {\"group_id\": self.group_id},\n+ )\n+ )[\"response\"]\nasync def listen(self) -> AsyncGenerator[dict, None]:\nserver = await self.get_server()\n@@ -64,7 +69,7 @@ class BotPolling(ABCPolling):\ncontinue\nserver[\"ts\"] = event[\"ts\"]\nyield event\n- except ServerConnectionError:\n+ except (ClientConnectionError, asyncio.TimeoutError):\nserver = await self.get_server()\nexcept Exception as e:\nawait self.error_handler.handle(e)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/polling/user_polling.py",
"new_path": "vkbottle/polling/user_polling.py",
"diff": "+import asyncio\nfrom typing import TYPE_CHECKING, AsyncIterator, Optional\n-from aiohttp.client_exceptions import ServerConnectionError\n+from aiohttp.client_exceptions import ClientConnectionError\nfrom vkbottle.exception_factory import ErrorHandler\nfrom vkbottle.modules import logger\n@@ -35,6 +36,7 @@ class UserPolling(ABCPolling):\nself.stop = False\nasync def get_event(self, server: dict) -> dict:\n+ # sourcery skip: use-fstring-for-formatting\nlogger.debug(\"Making long request to get event with longpoll...\")\nreturn await self.api.http_client.request_json(\n\"https://{}?act=a_check&key={}&ts={}&wait={}&mode={}&rps_delay={}\".format(\n@@ -65,7 +67,7 @@ class UserPolling(ABCPolling):\ncontinue\nserver[\"ts\"] = event[\"ts\"]\nyield event\n- except ServerConnectionError:\n+ except (ClientConnectionError, asyncio.TimeoutError):\nserver = await self.get_server()\nexcept Exception as e:\nawait self.error_handler.handle(e)\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Fix `TimeoutError` in polling
|
718,864 |
08.01.2023 22:10:14
| -25,200 |
3cc4a3a3d20e95fa362d3e59549450b7ffb66679
|
Add get_audio_attachments method
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/foreign_message.py",
"diff": "@@ -5,6 +5,7 @@ from pydantic import root_validator\nfrom vkbottle_types.objects import (\nAudioAudio,\nDocsDoc,\n+ MessagesAudioMessage,\nMessagesForeignMessage,\nPhotosPhoto,\nUsersUserFull,\n@@ -117,6 +118,13 @@ class BaseForeignMessageMin(MessagesForeignMessage, ABC):\nreturn None\nreturn [attachment.audio for attachment in self.attachments if attachment.audio]\n+ def get_audio_message_attachments(self) -> Optional[List[\"MessagesAudioMessage\"]]:\n+ if self.attachments is None:\n+ return None\n+ return [\n+ attachment.audio_message for attachment in self.attachments if attachment.audio_message\n+ ]\n+\ndef get_message_id(self) -> Optional[int]:\nreturn self.id or self.conversation_message_id\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/mini_types/base/message.py",
"new_path": "vkbottle/tools/dev/mini_types/base/message.py",
"diff": "@@ -7,6 +7,7 @@ from typing_extensions import Literal\nfrom vkbottle_types.objects import (\nAudioAudio,\nDocsDoc,\n+ MessagesAudioMessage,\nMessagesForward,\nMessagesMessage,\nPhotosPhoto,\n@@ -136,6 +137,13 @@ class BaseMessageMin(MessagesMessage, ABC):\nreturn None\nreturn [attachment.audio for attachment in self.attachments if attachment.audio]\n+ def get_audio_message_attachments(self) -> Optional[List[\"MessagesAudioMessage\"]]:\n+ if self.attachments is None:\n+ return None\n+ return [\n+ attachment.audio_message for attachment in self.attachments if attachment.audio_message\n+ ]\n+\ndef get_message_id(self) -> Optional[int]:\nreturn self.id or self.conversation_message_id\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add get_audio_attachments method (#609)
|
718,844 |
30.01.2023 08:40:10
| -10,800 |
b4659cbf44f55b97a82164600c1f322b0b91adf7
|
Add `SpeechUploader`
|
[
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/audio.py",
"new_path": "vkbottle/tools/dev/uploader/audio.py",
"diff": "@@ -49,7 +49,7 @@ class AudioUploader(BaseUploader):\n@property\ndef attachment_name(self) -> str:\n- return self.with_name or self.NAME\n+ return self._attachment_name or self.NAME\n__all__ = (\"AudioUploader\",)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/base.py",
"new_path": "vkbottle/tools/dev/uploader/base.py",
"diff": "@@ -18,7 +18,7 @@ class BaseUploader(ABC):\ndef __init__(\nself,\napi: \"ABCAPI\",\n- with_name: Optional[str] = None,\n+ attachment_name: Optional[str] = None,\n**kwargs,\n):\nself.api = api\n@@ -29,7 +29,7 @@ class BaseUploader(ABC):\nDeprecationWarning,\n)\nkwargs.pop(\"generate_attachment_strings\")\n- self.with_name = with_name\n+ self._attachment_name = attachment_name\n@abstractmethod\nasync def get_server(self, **kwargs) -> dict:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/doc.py",
"new_path": "vkbottle/tools/dev/uploader/doc.py",
"diff": "@@ -56,7 +56,7 @@ class DocUploader(BaseUploader):\n@property\ndef attachment_name(self) -> str:\n- return self.with_name or self.NAME\n+ return self._attachment_name or self.NAME\nclass DocWallUploader(DocUploader):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/photo.py",
"new_path": "vkbottle/tools/dev/uploader/photo.py",
"diff": "-import warnings\nfrom typing import TYPE_CHECKING, List, Optional, Union\nfrom .base import BaseUploader\n@@ -12,7 +11,7 @@ class PhotoUploader(BaseUploader):\n@property\ndef attachment_name(self) -> str:\n- return self.with_name or self.NAME\n+ return self._attachment_name or self.NAME\nclass PhotoToAlbumUploader(PhotoUploader):\n@@ -189,12 +188,9 @@ class PhotoChatFaviconUploader(PhotoUploader):\nself,\n**params,\n) -> str:\n- warnings.warn(\n- \"Chat favicon upload doesn't return attachment string. Use .raw_upload() instead\",\n- Warning,\n+ raise NotImplementedError(\n+ f\"{self.__class__.__name__} does not support upload() method. Use raw_upload(...) instead.\"\n)\n- await self.raw_upload(**params)\n- return \"\"\nasync def raw_upload(\nself,\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/tools/dev/uploader/speech.py",
"diff": "+from typing import TYPE_CHECKING, Union\n+\n+from typing_extensions import Literal\n+\n+from .base import BaseUploader\n+\n+if TYPE_CHECKING:\n+ from .base import Bytes\n+\n+\n+class SpeechUploader(BaseUploader):\n+ NAME = \"voice.ogg\"\n+\n+ async def get_server(self, **kwargs) -> dict:\n+ return (await self.api.request(\"asr.getUploadUrl\", kwargs))[\"response\"]\n+\n+ async def raw_upload(\n+ self,\n+ file_source: Union[str, \"Bytes\"],\n+ model: Literal[\"neutral\", \"spontaneous\"] = \"neutral\",\n+ **params,\n+ ) -> dict:\n+ server = await self.get_server(**params)\n+ data = await self.read(file_source)\n+\n+ file = self.get_bytes_io(data, name=self.attachment_name)\n+\n+ audio = await self.upload_files(server[\"upload_url\"], {\"file\": file})\n+\n+ return (\n+ await self.api.request(\n+ \"asr.process\",\n+ {\"model\": model, \"audio\": audio, **params},\n+ )\n+ )[\"response\"]\n+\n+ async def upload(\n+ self,\n+ **params,\n+ ) -> str:\n+ raise NotImplementedError(\n+ f\"{self.__class__.__name__} does not support upload() method. Use raw_upload(...) instead.\"\n+ )\n+\n+ @property\n+ def attachment_name(self) -> str:\n+ return self._attachment_name or self.NAME\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/tools/dev/uploader/video.py",
"new_path": "vkbottle/tools/dev/uploader/video.py",
"diff": "@@ -11,7 +11,7 @@ class VideoUploader(BaseUploader):\n@property\ndef attachment_name(self) -> str:\n- return self.with_name or self.NAME\n+ return self._attachment_name or self.NAME\nasync def upload(\nself,\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Add `SpeechUploader` (#624)
|
718,844 |
07.02.2023 00:19:58
| -10,800 |
ef9f5ead0c804a1cfcfae7202779f67dd41204e7
|
Bump version to 4.4.0-dev1
|
[
{
"change_type": "MODIFY",
"old_path": "pyproject.toml",
"new_path": "pyproject.toml",
"diff": "[tool.poetry]\nname = \"vkbottle\"\n-version = \"4.3.12\"\n+version = \"4.4.0-dev1\"\ndescription = \"Homogenic! Customizable asynchronous VK API framework implementing comfort and speed\"\nauthors = [\"timoniq\"]\nmaintainers = [\"FeeeeK\"]\n"
}
] |
Python
|
MIT License
|
vkbottle/vkbottle
|
Bump version to 4.4.0-dev1
|
455,776 |
03.01.2017 15:22:27
| 28,800 |
0066128a5f2fcdf4d71241a4313fbc18f4c9a9b9
|
Functional tests: Close all web responses after use
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ODataHelper.cs",
"new_path": "tests/NuGetGallery.FunctionalTests.Core/Helpers/ODataHelper.cs",
"diff": "@@ -143,8 +143,8 @@ public async Task<bool> ContainsResponseTextIgnoreCase(string url, params string\nprivate async Task<string> GetResponseText(string url)\n{\nvar request = WebRequest.Create(url);\n- var response = await request.GetResponseAsync();\n-\n+ using (var response = await request.GetResponseAsync())\n+ {\nstring responseText;\nusing (var sr = new StreamReader(response.GetResponseStream()))\n{\n@@ -153,12 +153,12 @@ private async Task<string> GetResponseText(string url)\nreturn responseText;\n}\n+ }\npublic async Task<WebResponse> SendRequest(string url)\n{\nvar request = WebRequest.Create(url);\n- var response = await request.GetResponseAsync().ConfigureAwait(false);\n- return response;\n+ return await request.GetResponseAsync().ConfigureAwait(false);\n}\npublic async Task DownloadPackageFromV2FeedWithOperation(string packageId, string version, string operation)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedTests.cs",
"diff": "@@ -91,7 +91,12 @@ public async Task ODataQueryFilter(string requestParametrs)\n{\n//If the search engine will be changed to handle the types of requests passed as inputs; the test inputs need to be changed.\nvar request = UrlHelper.V2FeedRootUrl + requestParametrs;\n- await Assert.ThrowsAsync<WebException>(async () => { await _odataHelper.SendRequest(request); });\n+ await Assert.ThrowsAsync<WebException>(async () =>\n+ {\n+ using (await _odataHelper.SendRequest(request))\n+ {\n+ }\n+ });\n}\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Functional tests: Close all web responses after use (#3431)
|
455,776 |
05.01.2017 15:06:04
| 28,800 |
0b7007b8b08dc6f7b781be0e0438ce10d448d719
|
Add more package validation to v2 API push
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -254,17 +254,32 @@ private async Task<ActionResult> CreatePackageInternal()\nusing (var packageToPush = new PackageArchiveReader(packageStream, leaveStreamOpen: false))\n{\n- NuspecReader nuspec = null;\ntry\n{\n- nuspec = packageToPush.GetNuspecReader();\n+ PackageService.EnsureValid(packageToPush);\n}\ncatch (Exception ex)\n{\n+ ex.Log();\n+\n+ var message = Strings.FailedToReadUploadFile;\n+ if (ex is InvalidPackageException || ex is InvalidDataException || ex is EntityException)\n+ {\n+ message = ex.Message;\n+ }\n+\n+ return new HttpStatusCodeWithBodyResult(HttpStatusCode.BadRequest, message);\n+ }\n+\n+ NuspecReader nuspec;\n+ var errors = ManifestValidator.Validate(packageToPush.GetNuspec(), out nuspec).ToArray();\n+ if (errors.Length > 0)\n+ {\n+ var errorsString = string.Join(\"', '\", errors.Select(error => error.ErrorMessage));\nreturn new HttpStatusCodeWithBodyResult(HttpStatusCode.BadRequest, string.Format(\nCultureInfo.CurrentCulture,\n- Strings.UploadPackage_InvalidNuspec,\n- ex.Message));\n+ errors.Length > 1 ? Strings.UploadPackage_InvalidNuspecMultiple : Strings.UploadPackage_InvalidNuspec,\n+ errorsString));\n}\nif (nuspec.GetMinClientVersion() > Constants.MaxSupportedMinClientVersion)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -230,28 +230,17 @@ public virtual async Task<ActionResult> UploadPackage(HttpPostedFileBase uploadF\n_packageService.EnsureValid(packageArchiveReader);\n}\n- catch (InvalidPackageException ipex)\n- {\n- ipex.Log();\n- ModelState.AddModelError(String.Empty, ipex.Message);\n- return View();\n- }\n- catch (InvalidDataException idex)\n- {\n- idex.Log();\n- ModelState.AddModelError(String.Empty, idex.Message);\n- return View();\n- }\n- catch (EntityException enex)\n- {\n- enex.Log();\n- ModelState.AddModelError(String.Empty, enex.Message);\n- return View();\n- }\ncatch (Exception ex)\n{\nex.Log();\n- ModelState.AddModelError(String.Empty, Strings.FailedToReadUploadFile);\n+\n+ var message = Strings.FailedToReadUploadFile;\n+ if (ex is InvalidPackageException || ex is InvalidDataException || ex is EntityException)\n+ {\n+ message = ex.Message;\n+ }\n+\n+ ModelState.AddModelError(String.Empty, message);\nreturn View();\n}\nfinally\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.Designer.cs",
"new_path": "src/NuGetGallery/Strings.Designer.cs",
"diff": "@@ -797,6 +797,15 @@ public class Strings {\n}\n}\n+ /// <summary>\n+ /// Looks up a localized string similar to The NuGet package contains an invalid .nuspec file. The errors encountered were: '{0}'. Correct the errors and try again..\n+ /// </summary>\n+ public static string UploadPackage_InvalidNuspecMultiple {\n+ get {\n+ return ResourceManager.GetString(\"UploadPackage_InvalidNuspecMultiple\", resourceCulture);\n+ }\n+ }\n+\n/// <summary>\n/// Looks up a localized string similar to The NuGet package is invalid. The error encountered was:'{0}'. Correct the error and try again..\n/// </summary>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Strings.resx",
"new_path": "src/NuGetGallery/Strings.resx",
"diff": "@@ -407,4 +407,7 @@ The {1} Team</value>\n<data name=\"UserAccountLocked\" xml:space=\"preserve\">\n<value>Your account was locked after too many unsuccessful sign-in attempts. Please try again in {0}.</value>\n</data>\n+ <data name=\"UploadPackage_InvalidNuspecMultiple\" xml:space=\"preserve\">\n+ <value>The NuGet package contains an invalid .nuspec file. The errors encountered were: '{0}'. Correct the errors and try again.</value>\n+ </data>\n</root>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Core.Facts/Packaging/PackageIdValidatorTest.cs",
"new_path": "tests/NuGetGallery.Core.Facts/Packaging/PackageIdValidatorTest.cs",
"diff": "@@ -39,7 +39,10 @@ public void NullThrowsException()\n[InlineData(\"I_.Like.-Separators\")]\n[InlineData(\"-StartWithSeparator\")]\n[InlineData(\"EndWithSeparator.\")]\n+ [InlineData(\"EndsWithHyphen-\")]\n[InlineData(\"$id$\")]\n+ [InlineData(\"Contains#Invalid$Characters!@#$%^&*\")]\n+ [InlineData(\"Contains#Invalid$Characters!@#$%^&*EndsOnValidCharacter\")]\npublic void ValidatePackageIdInvalidIdReturnsFalse(string packageId)\n{\n// Act\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -179,7 +179,7 @@ public async Task CreatePackageWillSendPackageAddedNotice()\n}\n[Fact]\n- public async Task CreatePackageWillReturn400IfPackageIsInvalid()\n+ public async Task CreatePackageWillReturn400IfFileIsNotANuGetPackage()\n{\n// Arrange\nvar user = new User() { EmailAddress = \"confirmed@email.com\" };\n@@ -203,6 +203,63 @@ public async Task CreatePackageWillReturn400IfPackageIsInvalid()\nResultAssert.IsStatusCode(result, HttpStatusCode.BadRequest);\n}\n+ private const string EnsureValidExceptionMessage = \"naughty package\";\n+\n+ [Theory]\n+ [InlineData(typeof(InvalidPackageException), true)]\n+ [InlineData(typeof(InvalidDataException), true)]\n+ [InlineData(typeof(EntityException), true)]\n+ [InlineData(typeof(Exception), false)]\n+ public async Task CreatePackageReturns400IfEnsureValidThrowsExceptionMessage(Type exceptionType, bool expectExceptionMessageInResponse)\n+ {\n+ // Arrange\n+ var nuGetPackage = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.42\");\n+\n+ var user = new User() { EmailAddress = \"confirmed@email.com\" };\n+ var controller = new TestableApiController();\n+ controller.SetCurrentUser(user);\n+ controller.SetupPackageFromInputStream(nuGetPackage);\n+\n+ var exception =\n+ exceptionType.GetConstructor(new[] { typeof(string) }).Invoke(new[] { EnsureValidExceptionMessage });\n+\n+ controller.MockPackageService.Setup(p => p.EnsureValid(It.IsAny<PackageArchiveReader>()))\n+ .Throws(exception as Exception);\n+\n+ // Act\n+ ActionResult result = await controller.CreatePackagePut();\n+\n+ // Assert\n+ ResultAssert.IsStatusCode(result, HttpStatusCode.BadRequest);\n+ Assert.Equal(expectExceptionMessageInResponse ? EnsureValidExceptionMessage : Strings.FailedToReadUploadFile, (result as HttpStatusCodeWithBodyResult).StatusDescription);\n+ }\n+\n+ [Theory]\n+ [InlineData(\"ILike*Asterisks\")]\n+ [InlineData(\"I_.Like.-Separators\")]\n+ [InlineData(\"-StartWithSeparator\")]\n+ [InlineData(\"EndWithSeparator.\")]\n+ [InlineData(\"EndsWithHyphen-\")]\n+ [InlineData(\"$id$\")]\n+ [InlineData(\"Contains#Invalid$Characters!@#$%^&*\")]\n+ [InlineData(\"Contains#Invalid$Characters!@#$%^&*EndsOnValidCharacter\")]\n+ public async Task CreatePackageReturns400IfPackageIdIsInvalid(string packageId)\n+ {\n+ // Arrange\n+ var nuGetPackage = TestPackage.CreateTestPackageStream(packageId, \"1.0.42\");\n+\n+ var user = new User() { EmailAddress = \"confirmed@email.com\" };\n+ var controller = new TestableApiController();\n+ controller.SetCurrentUser(user);\n+ controller.SetupPackageFromInputStream(nuGetPackage);\n+\n+ // Act\n+ ActionResult result = await controller.CreatePackagePut();\n+\n+ // Assert\n+ ResultAssert.IsStatusCode(result, HttpStatusCode.BadRequest);\n+ }\n+\n[Fact]\npublic async Task WillWriteAnAuditRecordIfUserIsNotPackageOwner()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\n+using System.Globalization;\nusing System.IO;\nusing System.Linq;\nusing System.Net.Mail;\n@@ -910,7 +911,7 @@ public async Task WillShowViewWithErrorsIfFileIsNotANuGetPackage()\n}\n[Fact]\n- public async Task WillShowViewWithErrorsIfNuGetPackageIsInvalid()\n+ public async Task WillShowViewWithErrorsIfEnsureValidThrowsException()\n{\nvar fakeUploadedFile = new Mock<HttpPostedFileBase>();\nfakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.nupkg\");\n@@ -929,6 +930,60 @@ public async Task WillShowViewWithErrorsIfNuGetPackageIsInvalid()\nAssert.Equal(Strings.FailedToReadUploadFile, controller.ModelState[String.Empty].Errors[0].ErrorMessage);\n}\n+ private const string EnsureValidExceptionMessage = \"naughty package\";\n+\n+ [Theory]\n+ [InlineData(typeof(InvalidPackageException), true)]\n+ [InlineData(typeof(InvalidDataException), true)]\n+ [InlineData(typeof(EntityException), true)]\n+ [InlineData(typeof(Exception), false)]\n+ public async Task WillShowViewWithErrorsIfEnsureValidThrowsExceptionMessage(Type exceptionType, bool expectExceptionMessageInResponse)\n+ {\n+ var fakeUploadedFile = new Mock<HttpPostedFileBase>();\n+ fakeUploadedFile.Setup(x => x.FileName).Returns(\"theFile.nupkg\");\n+ var fakeFileStream = TestPackage.CreateTestPackageStream(\"theId\", \"1.0.0\");\n+ fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);\n+\n+ var readPackageException =\n+ exceptionType.GetConstructor(new[] {typeof(string)}).Invoke(new[] { EnsureValidExceptionMessage });\n+\n+ var controller = CreateController(\n+ readPackageException: readPackageException as Exception);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ var result = await controller.UploadPackage(fakeUploadedFile.Object) as ViewResult;\n+\n+ Assert.NotNull(result);\n+ Assert.False(controller.ModelState.IsValid);\n+ Assert.Equal(expectExceptionMessageInResponse ? EnsureValidExceptionMessage : Strings.FailedToReadUploadFile, controller.ModelState[String.Empty].Errors[0].ErrorMessage);\n+ }\n+\n+ [Theory]\n+ [InlineData(\"ILike*Asterisks\")]\n+ [InlineData(\"I_.Like.-Separators\")]\n+ [InlineData(\"-StartWithSeparator\")]\n+ [InlineData(\"EndWithSeparator.\")]\n+ [InlineData(\"EndsWithHyphen-\")]\n+ [InlineData(\"$id$\")]\n+ [InlineData(\"Contains#Invalid$Characters!@#$%^&*\")]\n+ [InlineData(\"Contains#Invalid$Characters!@#$%^&*EndsOnValidCharacter\")]\n+ public async Task WillShowViewWithErrorsIfPackageIdIsInvalid(string packageId)\n+ {\n+ // Arrange\n+ var fakeUploadedFile = new Mock<HttpPostedFileBase>();\n+ fakeUploadedFile.Setup(x => x.FileName).Returns(packageId + \".nupkg\");\n+ var fakeFileStream = TestPackage.CreateTestPackageStream(packageId, \"1.0.0\");\n+ fakeUploadedFile.Setup(x => x.InputStream).Returns(fakeFileStream);\n+\n+ var controller = CreateController(fakeNuGetPackage: TestPackage.CreateTestPackageStream(packageId, \"1.0.0\"));\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ var result = await controller.UploadPackage(fakeUploadedFile.Object) as ViewResult;\n+\n+ Assert.NotNull(result);\n+ Assert.False(controller.ModelState.IsValid);\n+ }\n+\n[Fact]\npublic async Task WillShowTheViewWithErrorsWhenThePackageIdIsAlreadyBeingUsed()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add more package validation to v2 API push (#3446)
|
455,794 |
10.01.2017 20:47:31
| 28,800 |
89d78f069e6048dcbcbc743a88936ce21169bb83
|
Enforce HttpOnly and Secure cookie attributes
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/ForceSslWhenAuthenticatedMiddleware.cs",
"new_path": "src/NuGetGallery/Authentication/ForceSslWhenAuthenticatedMiddleware.cs",
"diff": "@@ -47,7 +47,12 @@ public override async Task Invoke(IOwinContext context)\n// Invoke the rest of the pipeline\nawait Next.Invoke(context);\n- var cookieOptions = new CookieOptions() { HttpOnly = true };\n+ var cookieOptions = new CookieOptions()\n+ {\n+ HttpOnly = true,\n+ Secure = context.Request.IsSecure\n+ };\n+\nif (context.Authentication.AuthenticationResponseGrant != null)\n{\n_logger.WriteVerbose(\"Auth Grant found, writing Force SSL cookie\");\n@@ -59,10 +64,7 @@ public override async Task Invoke(IOwinContext context)\n{\n_logger.WriteVerbose(\"Auth Revoke found, removing Force SSL cookie\");\n// We're revoking authentication, so remove the force ssl cookie\n- context.Response.Cookies.Delete(CookieName, new CookieOptions()\n- {\n- HttpOnly = true\n- });\n+ context.Response.Cookies.Delete(CookieName, cookieOptions);\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Infrastructure/CookieTempDataProvider.cs",
"new_path": "src/NuGetGallery/Infrastructure/CookieTempDataProvider.cs",
"diff": "@@ -76,6 +76,7 @@ protected virtual void SaveTempData(ControllerContext controllerContext, IDictio\n{\nvar cookie = new HttpCookie(TempDataCookieKey);\ncookie.HttpOnly = true;\n+ cookie.Secure = true;\nforeach (var item in values)\n{\ncookie[item.Key] = Convert.ToString(item.Value, CultureInfo.InvariantCulture);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<!-- Ensure only Admins may access elmah -->\n<location path=\"Admin\" inheritInChildApplications=\"false\">\n<system.web>\n- <httpCookies httpOnlyCookies=\"true\" />\n<httpHandlers>\n<add name=\"Elmah\" verb=\"POST,GET,HEAD\" path=\"Errors.axd\" type=\"Elmah.ErrorLogPageFactory, Elmah\" />\n</httpHandlers>\n</system.Web>\n-->\n<system.web>\n- <httpCookies requireSSL=\"true\" />\n+ <httpCookies requireSSL=\"true\" httpOnlyCookies=\"true\" />\n<compilation debug=\"true\" targetFramework=\"4.5.2\" />\n<pages controlRenderingCompatibilityVersion=\"4.0\">\n<namespaces>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Authentication/ForceSslWhenAuthenticatedMiddlewareFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Authentication/ForceSslWhenAuthenticatedMiddlewareFacts.cs",
"diff": "@@ -94,8 +94,10 @@ public async Task GivenNoForceSslCookieAndNonSslRequest_ItPassesThrough()\nnext.Verify(n => n.Invoke(It.IsAny<IOwinContext>()));\n}\n- [Fact]\n- public async Task GivenNextMiddlewareGrantsAuth_ItDropsForceSslCookie()\n+ [Theory]\n+ [InlineData(\"http\", false)]\n+ [InlineData(\"https\", true)]\n+ public async Task GivenNextMiddlewareGrantsAuth_ItDropsForceSslCookie(string protocol, bool secure)\n{\n// Arrange\nvar context = Fakes.CreateOwinContext();\n@@ -110,14 +112,14 @@ public async Task GivenNextMiddlewareGrantsAuth_ItDropsForceSslCookie()\nreturn Task.FromResult<object>(null);\n});\ncontext.Request\n- .SetUrl(\"http://nuget.local/foo/bar/baz?qux=qooz\");\n+ .SetUrl(protocol + \"://nuget.local/foo/bar/baz?qux=qooz\");\nvar middleware = new ForceSslWhenAuthenticatedMiddleware(next.Object, app, \"ForceSSL\", 443);\n// Act\nawait middleware.Invoke(context);\n// Assert\n- OwinAssert.SetsCookie(context.Response, \"ForceSSL\", \"true\");\n+ OwinAssert.SetsCookie(context.Response, \"ForceSSL\", \"true\", secure);\n}\n[Fact]\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Infrastructure/CookieTempDataProviderFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Infrastructure/CookieTempDataProviderFacts.cs",
"diff": "@@ -89,6 +89,7 @@ public void StoresValuesInCookie()\nAssert.Equal(1, cookies.Count);\nAssert.True(cookies[0].HttpOnly);\n+ Assert.True(cookies[0].Secure);\nAssert.Equal(3, cookies[0].Values.Count);\nAssert.Equal(\"Say hello to my little friend\", cookies[0][\"message\"]);\nAssert.Equal(\"123\", cookies[0][\"key2\"]);\n@@ -108,6 +109,31 @@ public void WithNoValuesDoesNotAddCookie()\nAssert.Equal(0, cookies.Count);\n}\n+\n+ [Fact]\n+ public void WithInitialStateAndNoValuesClearsCookie()\n+ {\n+ // Arrange and Setup\n+ var cookies = new HttpCookieCollection();\n+ var cookie = new HttpCookie(\"__Controller::TempData\");\n+ cookie.HttpOnly = true;\n+ cookie.Secure = true;\n+ cookies.Add(cookie);\n+ cookie[\"message\"] = \"clear\";\n+ var httpContext = new Mock<HttpContextBase>();\n+ httpContext.Setup(c => c.Request.Cookies).Returns(cookies);\n+ ITempDataProvider provider = new CookieTempDataProvider(httpContext.Object);\n+ var controllerContext = new ControllerContext();\n+\n+ var tempData = provider.LoadTempData(controllerContext);\n+\n+ // Validate\n+ provider.SaveTempData(controllerContext, new Dictionary<string, object>());\n+ Assert.Equal(1, cookies.Count);\n+ Assert.True(cookies[0].HttpOnly);\n+ Assert.True(cookies[0].Secure);\n+ Assert.Equal(\"\", cookies[0].Value);\n+ }\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/TestUtils/OwinAssert.cs",
"new_path": "tests/NuGetGallery.Facts/TestUtils/OwinAssert.cs",
"diff": "@@ -25,7 +25,7 @@ public static void WillRedirect(IOwinContext context, string expectedLocation)\nAssert.Equal(expectedLocation, context.Response.Headers[\"Location\"]);\n}\n- public static void SetsCookie(IOwinResponse response, string name, string expectedValue)\n+ public static void SetsCookie(IOwinResponse response, string name, string expectedValue, bool secure = true)\n{\n// Get the cookie\nvar cookie = GetCookie(response, name);\n@@ -33,6 +33,12 @@ public static void SetsCookie(IOwinResponse response, string name, string expect\n// Check the value\nAssert.NotNull(cookie);\nAssert.Equal(expectedValue, cookie.Value);\n+\n+ // Check cookie attributes\n+ var header = response.Headers[\"Set-Cookie\"];\n+ Assert.True(!String.IsNullOrEmpty(header));\n+ Assert.True(header.IndexOf(\"HttpOnly\", StringComparison.OrdinalIgnoreCase) > 0);\n+ Assert.Equal(secure, header.IndexOf(\"Secure\", StringComparison.OrdinalIgnoreCase) > 0);\n}\npublic static void DeletesCookie(IOwinResponse response, string name)\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Enforce HttpOnly and Secure cookie attributes (#3463)
|
455,776 |
12.01.2017 12:30:45
| 28,800 |
9216b034976d71edb9d6c4e467360b4b37916b9a
|
Delete uploaded package from blob storage if saving changes to DB fails
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -358,7 +358,16 @@ private async Task<ActionResult> CreatePackageInternal()\n}\n}\n+ try\n+ {\nawait EntitiesContext.SaveChangesAsync();\n+ }\n+ catch\n+ {\n+ // If saving to the DB fails for any reason, we need to delete the package we just saved.\n+ await PackageFileService.DeletePackageFileAsync(nuspec.GetId(), nuspec.GetVersion().ToNormalizedString());\n+ throw;\n+ }\nIndexingService.UpdatePackage(package);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1180,8 +1180,17 @@ public virtual async Task<ActionResult> VerifyPackage(VerifyPackageRequest formD\nreturn new RedirectResult(Url.VerifyPackage());\n}\n+ try\n+ {\n// commit all changes to database as an atomic transaction\nawait _entitiesContext.SaveChangesAsync();\n+ }\n+ catch\n+ {\n+ // If saving to the DB fails for any reason we need to delete the package we just saved.\n+ await _packageFileService.DeletePackageFileAsync(packageMetadata.Id, packageMetadata.Version.ToNormalizedString());\n+ throw;\n+ }\n// tell Lucene to update index for the new package\n_indexingService.UpdateIndex();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -118,6 +118,50 @@ public async Task CreatePackageWillSavePackageFileToFileStorage()\ncontroller.MockPackageFileService.Verify();\n}\n+ [Fact]\n+ public async Task WillDeletePackageFileFromBlobStorageIfSavingDbChangesFails()\n+ {\n+ // Arrange\n+ var user = new User() { EmailAddress = \"confirmed@email.com\" };\n+ var packageId = \"theId\";\n+ var packageVersion = \"1.0.42\";\n+ var packageRegistration = new PackageRegistration();\n+ packageRegistration.Id = packageId;\n+ packageRegistration.Owners.Add(user);\n+ var package = new Package();\n+ package.PackageRegistration = packageRegistration;\n+ package.Version = \"1.0.42\";\n+ packageRegistration.Packages.Add(package);\n+\n+ var controller = new TestableApiController();\n+ controller.SetCurrentUser(user);\n+ controller.MockPackageFileService.Setup(\n+ p => p.SavePackageFileAsync(It.IsAny<Package>(), It.IsAny<Stream>()))\n+ .Returns(Task.CompletedTask).Verifiable();\n+ controller.MockPackageFileService.Setup(\n+ p =>\n+ p.DeletePackageFileAsync(packageId,\n+ packageVersion))\n+ .Returns(Task.CompletedTask).Verifiable();\n+ controller.MockPackageService.Setup(p => p.FindPackageRegistrationById(It.IsAny<string>()))\n+ .Returns(packageRegistration);\n+ controller.MockPackageService.Setup(\n+ p =>\n+ p.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(),\n+ It.IsAny<User>(), false))\n+ .Returns(Task.FromResult(package));\n+ controller.MockEntitiesContext.Setup(e => e.SaveChangesAsync()).Throws<Exception>();\n+\n+ var nuGetPackage = TestPackage.CreateTestPackageStream(packageId, \"1.0.42\");\n+ controller.SetupPackageFromInputStream(nuGetPackage);\n+\n+ // Act\n+ await Assert.ThrowsAsync<Exception>(async () => await controller.CreatePackagePut());\n+\n+ // Assert\n+ controller.MockPackageFileService.Verify();\n+ }\n+\n[Fact]\npublic async Task WritesAnAuditRecord()\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1436,6 +1436,47 @@ public async Task WillSavePackageToFileStorage()\n}\n}\n+ [Fact]\n+ public async Task WillDeletePackageFileFromBlobStorageIfSavingDbChangesFails()\n+ {\n+ // Arrange\n+ var packageId = \"theId\";\n+ var packageVersion = \"1.0.0\";\n+ var fakeUploadFileService = new Mock<IUploadFileService>();\n+ using (var fakeFileStream = new MemoryStream())\n+ {\n+ fakeUploadFileService.Setup(x => x.GetUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult<Stream>(fakeFileStream));\n+ fakeUploadFileService.Setup(x => x.DeleteUploadFileAsync(TestUtility.FakeUser.Key)).Returns(Task.FromResult(0));\n+ var fakePackageService = new Mock<IPackageService>();\n+ var fakePackage = new Package { PackageRegistration = new PackageRegistration { Id = packageId }, Version = packageVersion };\n+ fakePackageService.Setup(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), It.IsAny<User>(), It.IsAny<bool>()))\n+ .Returns(Task.FromResult(fakePackage));\n+ var fakeNuGetPackage = TestPackage.CreateTestPackageStream(packageId, packageVersion);\n+\n+ var fakePackageFileService = new Mock<IPackageFileService>();\n+ fakePackageFileService.Setup(x => x.SavePackageFileAsync(fakePackage, It.IsAny<Stream>())).Returns(Task.CompletedTask).Verifiable();\n+ fakePackageFileService.Setup(x => x.DeletePackageFileAsync(packageId, packageVersion)).Returns(Task.CompletedTask).Verifiable();\n+\n+ var fakeEntitiesContext = new Mock<IEntitiesContext>();\n+ fakeEntitiesContext.Setup(e => e.SaveChangesAsync()).Throws<Exception>();\n+\n+ var controller = CreateController(\n+ packageService: fakePackageService,\n+ uploadFileService: fakeUploadFileService,\n+ fakeNuGetPackage: fakeNuGetPackage,\n+ packageFileService: fakePackageFileService,\n+ entitiesContext: fakeEntitiesContext);\n+ controller.SetCurrentUser(TestUtility.FakeUser);\n+\n+ // Act\n+ await Assert.ThrowsAsync<Exception>(async () => await controller.VerifyPackage(new VerifyPackageRequest() { Listed = true, Edit = null }));\n+\n+ // Assert\n+ fakePackageService.Verify(x => x.CreatePackageAsync(It.IsAny<PackageArchiveReader>(), It.IsAny<PackageStreamMetadata>(), TestUtility.FakeUser, false));\n+ fakePackageFileService.Verify();\n+ }\n+ }\n+\n[Fact]\npublic async Task WillShowViewWithMessageIfSavingPackageBlobFails()\n{\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Delete uploaded package from blob storage if saving changes to DB fails (#3469)
|
455,776 |
26.01.2017 15:53:15
| 28,800 |
9a1312613df48758dfc8f27e83d4d1b768f2d181
|
UseBasicParsing on web requests in Powershell
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -20,10 +20,15 @@ Packages.dgml\n[Dd]ebug/\n[Rr]elease/\nx64/\n-#build/ # We use this folder for our Build Scripts\n[Bb]in/\n[Oo]bj/\n+# Files created and used by our build scripts\n+build/\n+tools/\n+.nuget/CredentialProviderBundle.zip\n+AssemblyInfo.g.cs\n+\n# MSTest test Results\n[Tt]est[Rr]esult*/\n[Bb]uild[Ll]og.*\n"
},
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -11,7 +11,7 @@ param (\n[string]$SemanticVersion = '1.0.0-zlocal',\n[string]$Branch,\n[string]$CommitSHA,\n- [string]$BuildBranch = 'bff597e5990a14bb6ca53e371313d54bec48b4a6'\n+ [string]$BuildBranch = 'da881231d9ae9c966d0c18824f09f0122008e765'\n)\n# For TeamCity - If any issue occurs, this script fail the build. - By default, TeamCity returns an exit code of 0 for all powershell scripts, even if they fail\n@@ -26,7 +26,7 @@ trap {\nif (-not (Test-Path \"$PSScriptRoot/build\")) {\nNew-Item -Path \"$PSScriptRoot/build\" -ItemType \"directory\"\n}\n-wget -Uri \"https://raw.githubusercontent.com/NuGet/ServerCommon/$BuildBranch/build/init.ps1\" -OutFile \"$PSScriptRoot/build/init.ps1\"\n+wget -UseBasicParsing -Uri \"https://raw.githubusercontent.com/NuGet/ServerCommon/$BuildBranch/build/init.ps1\" -OutFile \"$PSScriptRoot/build/init.ps1\"\n. \"$PSScriptRoot/build/init.ps1\" -Branch \"$BuildBranch\"\nFunction Clean-Tests {\n@@ -71,14 +71,14 @@ Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' { `\nparam($Path, $Version, $Branch, $Commit)\nSet-VersionInfo -Path $Path -Version $Version -Branch $Branch -Commit $Commit `\n} `\n- -args (Join-Path $PSScriptRoot \"src\\NuGetGallery\\Properties\\AssemblyInfo.cs\"), $SimpleVersion, $Branch, $CommitSHA `\n+ -args (Join-Path $PSScriptRoot \"src\\NuGetGallery\\Properties\\AssemblyInfo.g.cs\"), $SimpleVersion, $Branch, $CommitSHA `\n-ev +BuildErrors\nInvoke-BuildStep 'Set version metadata in AssemblyInfo.cs' { `\nparam($Path, $Version, $Branch, $Commit)\nSet-VersionInfo -Path $Path -Version $Version -Branch $Branch -Commit $Commit `\n} `\n- -args (Join-Path $PSScriptRoot \"src\\NuGetGallery.Core\\Properties\\AssemblyInfo.cs\"), $SimpleVersion, $Branch, $CommitSHA `\n+ -args (Join-Path $PSScriptRoot \"src\\NuGetGallery.Core\\Properties\\AssemblyInfo.g.cs\"), $SimpleVersion, $Branch, $CommitSHA `\n-ev +BuildErrors\nInvoke-BuildStep 'Building solution' {\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"new_path": "src/NuGetGallery.Core/NuGetGallery.Core.csproj",
"diff": "<Compile Include=\"Packaging\\PackageMetadataStrings.cs\" />\n<Compile Include=\"Packaging\\PackageStreamMetadata.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n+ <Compile Include=\"Properties\\AssemblyInfo.*.cs\" />\n<Compile Include=\"NuGetVersionExtensions.cs\" />\n<Compile Include=\"StreamExtensions.cs\" />\n<Compile Include=\"Strings.Designer.cs\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "</Compile>\n<Compile Include=\"Services\\UserService.cs\" />\n<Compile Include=\"Properties\\AssemblyInfo.cs\" />\n+ <Compile Include=\"Properties\\AssemblyInfo.*.cs\" />\n<Compile Include=\"RequestModels\\SubmitPackageRequest.cs\" />\n<Compile Include=\"RouteNames.cs\" />\n<Compile Include=\"UrlExtensions.cs\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
UseBasicParsing on web requests in Powershell (#3488)
|
455,747 |
02.02.2017 15:54:52
| 28,800 |
2b94a5ee870751dcb36d2f8ac56f32a3ac20a902
|
Enable trace listeners for app insights
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ApplicationInsights.config",
"new_path": "src/NuGetGallery/ApplicationInsights.config",
"diff": "Note: If not present, please add <InstrumentationKey>Your Key</InstrumentationKey> to the top of this file.\n-->\n+ <TelemetryProcessors>\n+ <Add Type=\"Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryProcessor, Microsoft.AI.PerfCounterCollector\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.AdaptiveSamplingTelemetryProcessor, Microsoft.AI.ServerTelemetryChannel\">\n+ <MaxTelemetryItemsPerSecond>5</MaxTelemetryItemsPerSecond>\n+ </Add>\n+ </TelemetryProcessors>\n+ <TelemetryInitializers>\n+ <Add Type=\"Microsoft.ApplicationInsights.DependencyCollector.HttpDependenciesParsingTelemetryInitializer, Microsoft.AI.DependencyCollector\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.WindowsServer.AzureRoleEnvironmentTelemetryInitializer, Microsoft.AI.WindowsServer\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.WindowsServer.AzureWebAppRoleEnvironmentTelemetryInitializer, Microsoft.AI.WindowsServer\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.WindowsServer.BuildInfoConfigComponentVersionTelemetryInitializer, Microsoft.AI.WindowsServer\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.Web.WebTestTelemetryInitializer, Microsoft.AI.Web\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.Web.SyntheticUserAgentTelemetryInitializer, Microsoft.AI.Web\">\n+ <!-- Extended list of bots:\n+ search|spider|crawl|Bot|Monitor|BrowserMob|BingPreview|PagePeeker|WebThumb|URL2PNG|ZooShot|GomezA|Google SketchUp|Read Later|KTXN|KHTE|Keynote|Pingdom|AlwaysOn|zao|borg|oegp|silk|Xenu|zeal|NING|htdig|lycos|slurp|teoma|voila|yahoo|Sogou|CiBra|Nutch|Java|JNLP|Daumoa|Genieo|ichiro|larbin|pompos|Scrapy|snappy|speedy|vortex|favicon|indexer|Riddler|scooter|scraper|scrubby|WhatWeb|WinHTTP|voyager|archiver|Icarus6j|mogimogi|Netvibes|altavista|charlotte|findlinks|Retreiver|TLSProber|WordPress|wsr-agent|http client|Python-urllib|AppEngine-Google|semanticdiscovery|facebookexternalhit|web/snippet|Google-HTTP-Java-Client-->\n+ <Filters>search|spider|crawl|Bot|Monitor|AlwaysOn</Filters>\n+ </Add>\n+ <Add Type=\"Microsoft.ApplicationInsights.Web.ClientIpHeaderTelemetryInitializer, Microsoft.AI.Web\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.Web.OperationNameTelemetryInitializer, Microsoft.AI.Web\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.Web.OperationCorrelationTelemetryInitializer, Microsoft.AI.Web\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.Web.UserTelemetryInitializer, Microsoft.AI.Web\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.Web.AuthenticatedUserIdTelemetryInitializer, Microsoft.AI.Web\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.Web.AccountIdTelemetryInitializer, Microsoft.AI.Web\"/>\n+ <Add Type=\"Microsoft.ApplicationInsights.Web.SessionTelemetryInitializer, Microsoft.AI.Web\"/>\n+ </TelemetryInitializers>\n<TelemetryModules>\n<Add Type=\"Microsoft.ApplicationInsights.DependencyCollector.DependencyTrackingTelemetryModule, Microsoft.AI.DependencyCollector\"/>\n<Add Type=\"Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.PerformanceCollectorModule, Microsoft.AI.PerfCounterCollector\">\nPerformanceCounter must be either \\CategoryName(InstanceName)\\CounterName or \\CategoryName\\CounterName\n- Counter names may only contain letters, round brackets, forward slashes, hyphens, underscores, spaces and dots.\n- You may provide an optional ReportAs attribute which will be used as the metric name when reporting counter data.\n- For the purposes of reporting, metric names will be sanitized by removing all invalid characters from the resulting metric name.\n-\nNOTE: performance counters configuration will be lost upon NuGet upgrade.\nThe following placeholders are supported as InstanceName:\n??APP_CLR_PROC?? - instance name of the application CLR process for .NET counters.\n-->\n</Add>\n+ <Add Type=\"Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryModule, Microsoft.AI.PerfCounterCollector\"/>\n<Add Type=\"Microsoft.ApplicationInsights.WindowsServer.DeveloperModeWithDebuggerAttachedTelemetryModule, Microsoft.AI.WindowsServer\"/>\n<Add Type=\"Microsoft.ApplicationInsights.WindowsServer.UnhandledExceptionTelemetryModule, Microsoft.AI.WindowsServer\"/>\n<Add Type=\"Microsoft.ApplicationInsights.WindowsServer.UnobservedExceptionTelemetryModule, Microsoft.AI.WindowsServer\"/>\n<Add Type=\"Microsoft.ApplicationInsights.Web.ExceptionTrackingTelemetryModule, Microsoft.AI.Web\"/>\n</TelemetryModules>\n<TelemetryChannel Type=\"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.ServerTelemetryChannel, Microsoft.AI.ServerTelemetryChannel\"/>\n- <TelemetryProcessors>\n- <Add Type=\"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.AdaptiveSamplingTelemetryProcessor, Microsoft.AI.ServerTelemetryChannel\">\n- <MaxTelemetryItemsPerSecond>5</MaxTelemetryItemsPerSecond>\n- </Add>\n- </TelemetryProcessors>\n<!--\nLearn more about Application Insights configuration with ApplicationInsights.config here:\nhttp://go.microsoft.com/fwlink/?LinkID=513840\nNote: If not present, please add <InstrumentationKey>Your Key</InstrumentationKey> to the top of this file.\n- -->\n-<TelemetryInitializers>\n-<Add Type=\"Microsoft.ApplicationInsights.WindowsServer.AzureRoleEnvironmentTelemetryInitializer, Microsoft.AI.WindowsServer\"/>\n-<Add Type=\"Microsoft.ApplicationInsights.WindowsServer.DomainNameRoleInstanceTelemetryInitializer, Microsoft.AI.WindowsServer\"/>\n-<Add Type=\"Microsoft.ApplicationInsights.WindowsServer.BuildInfoConfigComponentVersionTelemetryInitializer, Microsoft.AI.WindowsServer\"/>\n-<Add Type=\"Microsoft.ApplicationInsights.Web.WebTestTelemetryInitializer, Microsoft.AI.Web\"/>\n-<Add Type=\"Microsoft.ApplicationInsights.Web.SyntheticUserAgentTelemetryInitializer, Microsoft.AI.Web\">\n-<Filters>\n-<Add Pattern=\"(YottaaMonitor|BrowserMob|HttpMonitor|YandexBot|BingPreview|PagePeeker|ThumbShotsBot|WebThumb|URL2PNG|ZooShot|GomezA|Catchpoint bot|Willow Internet Crawler|Google SketchUp|Read%20Later|KTXN|Pingdom|AlwaysOn)\"/>\n-<Add Pattern=\"Slurp\" SourceName=\"Yahoo Bot\"/>\n-<Add Pattern=\"(bot|zao|borg|Bot|oegp|silk|Xenu|zeal|^NING|crawl|Crawl|htdig|lycos|slurp|teoma|voila|yahoo|Sogou|CiBra|Nutch|^Java/|^JNLP/|Daumoa|Genieo|ichiro|larbin|pompos|Scrapy|snappy|speedy|spider|Spider|vortex|favicon|indexer|Riddler|scooter|scraper|scrubby|WhatWeb|WinHTTP|^voyager|archiver|Icarus6j|mogimogi|Netvibes|altavista|charlotte|findlinks|Retreiver|TLSProber|WordPress|wsr\\-agent|Squrl Java|A6\\-Indexer|netresearch|searchsight|http%20client|Python-urllib|dataparksearch|Screaming Frog|AppEngine-Google|YahooCacheSystem|semanticdiscovery|facebookexternalhit|Google.*/\\+/web/snippet|Google-HTTP-Java-Client)\"\n-SourceName=\"Spider\"/>\n-</Filters>\n-</Add>\n-<Add Type=\"Microsoft.ApplicationInsights.Web.ClientIpHeaderTelemetryInitializer, Microsoft.AI.Web\"/>\n-<Add Type=\"Microsoft.ApplicationInsights.Web.OperationNameTelemetryInitializer, Microsoft.AI.Web\"/>\n-<Add Type=\"Microsoft.ApplicationInsights.Web.OperationCorrelationTelemetryInitializer, Microsoft.AI.Web\"/>\n-<Add Type=\"Microsoft.ApplicationInsights.Web.UserTelemetryInitializer, Microsoft.AI.Web\"/>\n-<Add Type=\"Microsoft.ApplicationInsights.Web.AuthenticatedUserIdTelemetryInitializer, Microsoft.AI.Web\"/>\n-<Add Type=\"Microsoft.ApplicationInsights.Web.AccountIdTelemetryInitializer, Microsoft.AI.Web\"/>\n-<Add Type=\"Microsoft.ApplicationInsights.Web.SessionTelemetryInitializer, Microsoft.AI.Web\"/>\n-</TelemetryInitializers>\n-</ApplicationInsights>\n\\ No newline at end of file\n+ --></ApplicationInsights>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/NuGetGallery.csproj",
"new_path": "src/NuGetGallery/NuGetGallery.csproj",
"diff": "<HintPath>..\\..\\packages\\MarkdownSharp.1.13.0.0\\lib\\35\\MarkdownSharp.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"Microsoft.AI.Agent.Intercept, Version=1.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <SpecificVersion>False</SpecificVersion>\n- <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.Agent.Intercept.1.2.1\\lib\\net45\\Microsoft.AI.Agent.Intercept.dll</HintPath>\n+ <Reference Include=\"Microsoft.AI.Agent.Intercept, Version=2.0.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.Agent.Intercept.2.0.6\\lib\\net45\\Microsoft.AI.Agent.Intercept.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"Microsoft.AI.DependencyCollector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <SpecificVersion>False</SpecificVersion>\n- <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.DependencyCollector.2.0.0\\lib\\net45\\Microsoft.AI.DependencyCollector.dll</HintPath>\n+ <Reference Include=\"Microsoft.AI.DependencyCollector, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.DependencyCollector.2.2.0\\lib\\net45\\Microsoft.AI.DependencyCollector.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"Microsoft.AI.PerfCounterCollector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <SpecificVersion>False</SpecificVersion>\n- <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.PerfCounterCollector.2.0.0\\lib\\net45\\Microsoft.AI.PerfCounterCollector.dll</HintPath>\n+ <Reference Include=\"Microsoft.AI.PerfCounterCollector, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.PerfCounterCollector.2.2.0\\lib\\net45\\Microsoft.AI.PerfCounterCollector.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"Microsoft.AI.ServerTelemetryChannel, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <SpecificVersion>False</SpecificVersion>\n- <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.0.0\\lib\\net45\\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>\n+ <Reference Include=\"Microsoft.AI.ServerTelemetryChannel, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0\\lib\\net45\\Microsoft.AI.ServerTelemetryChannel.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"Microsoft.AI.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <SpecificVersion>False</SpecificVersion>\n- <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.Web.2.0.0\\lib\\net45\\Microsoft.AI.Web.dll</HintPath>\n+ <Reference Include=\"Microsoft.AI.Web, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.Web.2.2.0\\lib\\net45\\Microsoft.AI.Web.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"Microsoft.AI.WindowsServer, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <SpecificVersion>False</SpecificVersion>\n- <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.WindowsServer.2.0.0\\lib\\net45\\Microsoft.AI.WindowsServer.dll</HintPath>\n+ <Reference Include=\"Microsoft.AI.WindowsServer, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.WindowsServer.2.2.0\\lib\\net45\\Microsoft.AI.WindowsServer.dll</HintPath>\n<Private>True</Private>\n</Reference>\n- <Reference Include=\"Microsoft.ApplicationInsights, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n- <SpecificVersion>False</SpecificVersion>\n- <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.2.0.0\\lib\\net45\\Microsoft.ApplicationInsights.dll</HintPath>\n+ <Reference Include=\"Microsoft.ApplicationInsights, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.2.2.0\\lib\\net45\\Microsoft.ApplicationInsights.dll</HintPath>\n+ <Private>True</Private>\n+ </Reference>\n+ <Reference Include=\"Microsoft.ApplicationInsights.TraceListener, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n+ <HintPath>..\\..\\packages\\Microsoft.ApplicationInsights.TraceListener.2.2.0\\lib\\net45\\Microsoft.ApplicationInsights.TraceListener.dll</HintPath>\n<Private>True</Private>\n</Reference>\n<Reference Include=\"Microsoft.ApplicationServer.Caching.Client, Version=101.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL\">\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Web.config",
"new_path": "src/NuGetGallery/Web.config",
"diff": "<add name=\"ErrorMail\" type=\"Elmah.ErrorMailModule, Elmah\" preCondition=\"managedHandler\" />\n<add name=\"ErrorFilter\" type=\"Elmah.ErrorFilterModule, Elmah\" preCondition=\"managedHandler\" />\n<add name=\"AsyncFileUpload\" type=\"NuGetGallery.AsyncFileUpload.AsyncFileUploadModule, NuGetGallery\" preCondition=\"managedHandler\" />\n-\n+ <remove name=\"RoleManager\" />\n<remove name=\"ApplicationInsightsWebTracking\" />\n<add name=\"ApplicationInsightsWebTracking\" type=\"Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web\" preCondition=\"managedHandler\" />\n- <remove name=\"RoleManager\" />\n</modules>\n<validation validateIntegratedModeConfiguration=\"false\" />\n<httpErrors errorMode=\"DetailedLocalOnly\">\n<provider invariantName=\"System.Data.SqlClient\" type=\"System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer\" />\n</providers>\n</entityFramework>\n+ <system.diagnostics>\n+ <trace autoflush=\"true\" indentsize=\"0\">\n+ <listeners>\n+ <add name=\"myAppInsightsListener\" type=\"Microsoft.ApplicationInsights.TraceListener.ApplicationInsightsTraceListener, Microsoft.ApplicationInsights.TraceListener\" />\n+ </listeners>\n+ </trace>\n+ </system.diagnostics>\n</configuration>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/packages.config",
"new_path": "src/NuGetGallery/packages.config",
"diff": "<package id=\"Lucene.Net\" version=\"3.0.3\" targetFramework=\"net452\" />\n<package id=\"Lucene.Net.Contrib\" version=\"3.0.3\" targetFramework=\"net452\" />\n<package id=\"MarkdownSharp\" version=\"1.13.0.0\" targetFramework=\"net452\" />\n- <package id=\"Microsoft.ApplicationInsights\" version=\"2.0.0\" targetFramework=\"net452\" />\n- <package id=\"Microsoft.ApplicationInsights.Agent.Intercept\" version=\"1.2.1\" targetFramework=\"net452\" />\n- <package id=\"Microsoft.ApplicationInsights.DependencyCollector\" version=\"2.0.0\" targetFramework=\"net452\" />\n- <package id=\"Microsoft.ApplicationInsights.PerfCounterCollector\" version=\"2.0.0\" targetFramework=\"net452\" />\n- <package id=\"Microsoft.ApplicationInsights.Web\" version=\"2.0.0\" targetFramework=\"net452\" />\n- <package id=\"Microsoft.ApplicationInsights.WindowsServer\" version=\"2.0.0\" targetFramework=\"net452\" />\n- <package id=\"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel\" version=\"2.0.0\" targetFramework=\"net452\" />\n+ <package id=\"Microsoft.ApplicationInsights\" version=\"2.2.0\" targetFramework=\"net452\" />\n+ <package id=\"Microsoft.ApplicationInsights.Agent.Intercept\" version=\"2.0.6\" targetFramework=\"net452\" />\n+ <package id=\"Microsoft.ApplicationInsights.DependencyCollector\" version=\"2.2.0\" targetFramework=\"net452\" />\n+ <package id=\"Microsoft.ApplicationInsights.PerfCounterCollector\" version=\"2.2.0\" targetFramework=\"net452\" />\n+ <package id=\"Microsoft.ApplicationInsights.TraceListener\" version=\"2.2.0\" targetFramework=\"net452\" />\n+ <package id=\"Microsoft.ApplicationInsights.Web\" version=\"2.2.0\" targetFramework=\"net452\" />\n+ <package id=\"Microsoft.ApplicationInsights.WindowsServer\" version=\"2.2.0\" targetFramework=\"net452\" />\n+ <package id=\"Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel\" version=\"2.2.0\" targetFramework=\"net452\" />\n<package id=\"Microsoft.AspNet.DynamicData.EFProvider\" version=\"6.0.0\" targetFramework=\"net452\" />\n<package id=\"Microsoft.AspNet.EntityDataSource\" version=\"6.0.0\" targetFramework=\"net452\" />\n<package id=\"Microsoft.AspNet.Identity.Core\" version=\"1.0.0\" targetFramework=\"net452\" />\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Enable trace listeners for app insights (#3523)
|
455,776 |
06.02.2017 10:27:59
| 28,800 |
f8405f3a8c596eed51fdaca24334a61298da3eaf
|
Prevent $BuildBranch overwriting
|
[
{
"change_type": "MODIFY",
"old_path": "build.ps1",
"new_path": "build.ps1",
"diff": "@@ -11,7 +11,7 @@ param (\n[string]$SemanticVersion = '1.0.0-zlocal',\n[string]$Branch,\n[string]$CommitSHA,\n- [string]$BuildBranch = 'da881231d9ae9c966d0c18824f09f0122008e765'\n+ [string]$BuildBranch = 'a8c27302d8720d094c2dce87e00324d84b4697b2'\n)\n# For TeamCity - If any issue occurs, this script fail the build. - By default, TeamCity returns an exit code of 0 for all powershell scripts, even if they fail\n@@ -27,7 +27,7 @@ if (-not (Test-Path \"$PSScriptRoot/build\")) {\nNew-Item -Path \"$PSScriptRoot/build\" -ItemType \"directory\"\n}\nwget -UseBasicParsing -Uri \"https://raw.githubusercontent.com/NuGet/ServerCommon/$BuildBranch/build/init.ps1\" -OutFile \"$PSScriptRoot/build/init.ps1\"\n-. \"$PSScriptRoot/build/init.ps1\" -Branch \"$BuildBranch\"\n+. \"$PSScriptRoot/build/init.ps1\" -BuildBranch \"$BuildBranch\"\nFunction Clean-Tests {\n[CmdletBinding()]\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Prevent $BuildBranch overwriting (#3528)
|
455,777 |
08.02.2017 03:23:19
| -36,000 |
88624eda14d55d063cf911a5b6756aa5ae57752e
|
Update Octopus link
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Shared/LayoutFooter.cshtml",
"new_path": "src/NuGetGallery/Views/Shared/LayoutFooter.cshtml",
"diff": "<a href=\"https://status.nuget.org\">Service status</a>\n</p>\n<p>\n- Deployed using <a href=\"http://octopusdeploy.com/\" target=\"referral\">Octopus Deploy</a> | Uses <a href=\"http://fontawesome.io\" target=\"referral\">Font Awesome</a> by Dave Gandy\n+ Deployed using <a href=\"https://octopus.com/\" target=\"referral\">Octopus Deploy</a> | Uses <a href=\"http://fontawesome.io\" target=\"referral\">Font Awesome</a> by Dave Gandy\n</p>\n@ViewHelpers.ReleaseTag()\n</div>\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Update Octopus link (#3533)
|
455,776 |
10.02.2017 16:17:19
| 28,800 |
2ed3feea2827856fec0434b14e0fe83ef82db5cd
|
Add Deploy-StaticContent.ps1
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "Deploy-StaticContent.ps1",
"diff": "+[CmdletBinding(DefaultParameterSetName='RegularBuild')]\n+param (\n+ [string]$StorageAccountName,\n+ [string]$StorageAccountKey,\n+ [string]$Environment\n+)\n+\n+Write-Host \"Uploading static $Environment gallery content to $StorageAccountName.\"\n+\n+[System.Reflection.Assembly]::LoadFrom(\"C:\\Program Files\\Microsoft SDKs\\Azure\\.NET SDK\\v2.9\\bin\\Microsoft.WindowsAzure.StorageClient.dll\")\n+\n+$account = [Microsoft.WindowsAzure.CloudStorageAccount]::Parse(\"DefaultEndpointsProtocol=https;AccountName=$StorageAccountName;AccountKey=$StorageAccountKey\")\n+$client = [Microsoft.WindowsAzure.StorageClient.CloudStorageAccountStorageClientExtensions]::CreateCloudBlobClient($account)\n+\n+$files = Get-ChildItem \".\\content\\$Environment\"\n+foreach ($file in $files) {\n+ $blob = $client.GetBlockBlob(\"content/$file\")\n+ try {\n+ $snappy = $blob.CreateSnapshot()\n+ Write-Host \"Created snapshot of existing 'content/$file'.\"\n+ } catch {}\n+ $blob.UploadFile($file.FullName)\n+ Write-Host \"Uploaded 'content/$file'.\"\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "content/PROD/Team.json",
"new_path": "content/PROD/Team.json",
"diff": "\"sblom\",\n\"zhili1208\",\n\"xavierdecoster\",\n- \"maartenba\"\n+ \"maartenba\",\n+ \"scottbommarito\",\n+ \"joelverhagen\",\n+ \"shishirx34\",\n+ \"ryuyu\",\n+ \"skofman1\",\n+ \"chenriksson\",\n+ \"cristinamanum\",\n+ \"alpaix\",\n+ \"anangaur\",\n+ \"diverdan92\",\n+ \"DoRonMotter\",\n+ \"drewgillies\",\n+ \"dtivel\",\n+ \"ericstj\",\n+ \"jainaashish\",\n+ \"jasonmalinowski\",\n+ \"jonwchu\",\n+ \"karann-msft\",\n+ \"mishra14\",\n+ \"nkolev92\",\n+ \"rohit21agrawal\",\n+ \"rrelyea\",\n+ \"yishaigalatzer\"\n]\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add Deploy-StaticContent.ps1 (#3529)
|
455,731 |
16.02.2017 14:43:45
| 28,800 |
81f0cd5010f4575b4fbe023bf387376f9c204207
|
Allow package title reuse with soft-deleted package
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageNamingConflictValidator.cs",
"new_path": "src/NuGetGallery/Services/PackageNamingConflictValidator.cs",
"diff": "@@ -56,7 +56,7 @@ public bool IdConflictsWithExistingPackageTitle(string registrationId)\nregistrationId = registrationId.ToLowerInvariant();\nreturn _packageRepository.GetAll()\n- .Any(p => p.Title.ToLower() == registrationId);\n+ .Any(p => !p.Deleted && p.Title.ToLower() == registrationId);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageNamingConflictValidatorFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageNamingConflictValidatorFacts.cs",
"diff": "@@ -16,7 +16,7 @@ public class PackageNamingConflictValidatorFacts\n[InlineData(\"Microsoft.FooBar\", \"Another.Package\", false)]\n[InlineData(\"Microsoft.FooBar\", \"another.package\", false)]\n[InlineData(\"Microsoft.FooBar\", \"Microsoft.FooBar contribution package\", false)]\n- private void TitleConflictsWithExistingRegistrationIdTests(string existingRegistrationId, string newPackageTitle, bool shouldBeConflict)\n+ public void TitleConflictsWithExistingRegistrationIdTests(string existingRegistrationId, string newPackageTitle, bool shouldBeConflict)\n{\n// Arrange\nvar existingPackageRegistration = new PackageRegistration\n@@ -25,12 +25,7 @@ private void TitleConflictsWithExistingRegistrationIdTests(string existingRegist\nOwners = new HashSet<User>()\n};\n- var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();\n- packageRegistrationRepository.Setup(r => r.GetAll()).Returns(new[] { existingPackageRegistration }.AsQueryable());\n-\n- var packageRepository = new Mock<IEntityRepository<Package>>();\n-\n- var target = new PackageNamingConflictValidator(packageRegistrationRepository.Object, packageRepository.Object);\n+ var target = CreateValidator(existingPackageRegistration, package: null);\n// Act\nvar result = target.TitleConflictsWithExistingRegistrationId(\"NewPackageId\", newPackageTitle);\n@@ -39,7 +34,6 @@ private void TitleConflictsWithExistingRegistrationIdTests(string existingRegist\nAssert.True(result == shouldBeConflict);\n}\n-\n[Theory]\n[InlineData(\"ExistingPackageId\", \"ExistingPackageTitle\", \"NewPackageId\", false)]\n[InlineData(\"ExistingPackageId\", \"ExistingPackageTitle\", \"newpackageid\", false)]\n@@ -60,13 +54,7 @@ public void IdConflictsWithExistingPackageTitleTests(string existingPackageId, s\nTitle = existingPackageTitle\n};\n- var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();\n- packageRegistrationRepository.Setup(r => r.GetAll()).Returns(new[] { existingPackageRegistration }.AsQueryable());\n-\n- var packageRepository = new Mock<IEntityRepository<Package>>();\n- packageRepository.Setup(r => r.GetAll()).Returns(new[] { existingPackage }.AsQueryable());\n-\n- var target = new PackageNamingConflictValidator(packageRegistrationRepository.Object, packageRepository.Object);\n+ var target = CreateValidator(existingPackageRegistration, existingPackage);\n// Act\nvar result = target.IdConflictsWithExistingPackageTitle(newPackageId);\n@@ -74,5 +62,74 @@ public void IdConflictsWithExistingPackageTitleTests(string existingPackageId, s\n// Assert\nAssert.True(result == shouldBeConflict);\n}\n+\n+ [Theory]\n+ [InlineData(true)]\n+ [InlineData(false)]\n+ public void IdConflictsWithExistingPackageTitle_DoesNotSupportTitleReuseWithNonDeletedPackage(bool isExistingPackageListed)\n+ {\n+ // Arrange\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Id = \"A\",\n+ Owners = new HashSet<User>()\n+ };\n+ var package = new Package\n+ {\n+ PackageRegistration = packageRegistration,\n+ Version = \"1.0.0\",\n+ Title = \"B\",\n+ Listed = isExistingPackageListed,\n+ Deleted = false\n+ };\n+ var target = CreateValidator(packageRegistration, package);\n+\n+ // Act\n+ var actualResult = target.IdConflictsWithExistingPackageTitle(registrationId: \"B\");\n+\n+ // Assert\n+ Assert.True(actualResult);\n+ }\n+\n+ [Fact]\n+ public void IdConflictsWithExistingPackageTitle_SupportsTitleReuseWithSoftDeletedPackage()\n+ {\n+ // Arrange\n+ var packageRegistration = new PackageRegistration\n+ {\n+ Id = \"A\",\n+ Owners = new HashSet<User>()\n+ };\n+ var package = new Package\n+ {\n+ PackageRegistration = packageRegistration,\n+ Version = \"1.0.0\",\n+ Title = \"B\",\n+ Listed = false,\n+ Deleted = true\n+ };\n+ var target = CreateValidator(packageRegistration, package);\n+\n+ // Act\n+ var actualResult = target.IdConflictsWithExistingPackageTitle(registrationId: \"B\");\n+\n+ // Assert\n+ Assert.False(actualResult);\n+ }\n+\n+ private static PackageNamingConflictValidator CreateValidator(PackageRegistration packageRegistration, Package package)\n+ {\n+ var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();\n+ packageRegistrationRepository.Setup(r => r.GetAll()).Returns(new[] { packageRegistration }.AsQueryable());\n+\n+ var packageRepository = new Mock<IEntityRepository<Package>>();\n+\n+ if (package != null)\n+ {\n+ packageRepository.Setup(r => r.GetAll()).Returns(new[] { package }.AsQueryable());\n+ }\n+\n+ return new PackageNamingConflictValidator(packageRegistrationRepository.Object, packageRepository.Object);\n+ }\n}\n}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Allow package title reuse with soft-deleted package (#3570)
|
455,772 |
21.02.2017 13:31:30
| 28,800 |
5949008e18b9483bcbabfa83b9ec6f38fae00ab2
|
refactor test hook
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "@@ -185,3 +185,4 @@ Results.?.xml\n.vs/config/applicationhost.config\nsrc/NuGetGallery/App_Data/Files/auditing/\nartifacts/\n+.vs\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/AppController.cs",
"new_path": "src/NuGetGallery/Controllers/AppController.cs",
"diff": "@@ -14,19 +14,20 @@ public abstract partial class AppController\n{\nprivate IOwinContext _overrideContext;\n- public IOwinContext OwinContext\n- {\n- get { return _overrideContext ?? HttpContext.GetOwinContext(); }\n- set { _overrideContext = value; }\n- }\n+ public IOwinContext OwinContext => _overrideContext ?? HttpContext.GetOwinContext();\n- public NuGetContext NuGetContext { get; private set; }\n+ public NuGetContext NuGetContext { get; }\npublic new ClaimsPrincipal User\n{\nget { return base.User as ClaimsPrincipal; }\n}\n+ public void SetOwinContextOverride(IOwinContext owinContext)\n+ {\n+ _overrideContext = owinContext;\n+ }\n+\nprotected AppController()\n{\nNuGetContext = new NuGetContext(this);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -41,7 +41,7 @@ class TestableApiController : ApiController\npublic TestableApiController(MockBehavior behavior = MockBehavior.Default)\n{\n- OwinContext = Fakes.CreateOwinContext();\n+ SetOwinContextOverride(Fakes.CreateOwinContext());\nEntitiesContext = (MockEntitiesContext = new Mock<IEntitiesContext>()).Object;\nPackageService = (MockPackageService = new Mock<IPackageService>(behavior)).Object;\nUserService = (MockUserService = new Mock<IUserService>(behavior)).Object;\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/AppControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/AppControllerFacts.cs",
"diff": "@@ -15,7 +15,7 @@ public void GivenNoActiveUserPrincipal_ItReturnsNull()\n{\n// Arrange\nvar ctrl = new TestableAppController();\n- ctrl.OwinContext = Fakes.CreateOwinContext();\n+ ctrl.SetOwinContextOverride(Fakes.CreateOwinContext());\n// Act\nvar user = ctrl.InvokeGetCurrentUser();\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/CuratedFeedsControllerFacts.cs",
"diff": "@@ -27,7 +27,7 @@ public TestableCuratedFeedsController()\n{ Key = 0, Name = \"aName\", Managers = new HashSet<User>(new[] { Fakes.User }) };\nStubCuratedFeedService = new Mock<ICuratedFeedService>();\n- OwinContext = Fakes.CreateOwinContext();\n+ SetOwinContextOverride(Fakes.CreateOwinContext());\nStubCuratedFeedService\n.Setup(stub => stub.GetFeedByName(It.IsAny<string>(), It.IsAny<bool>()))\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/CuratedPackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/CuratedPackagesControllerFacts.cs",
"diff": "@@ -26,7 +26,7 @@ public TestableCuratedPackagesController()\n{ Key = 0, Name = \"aFeedName\", Managers = new HashSet<User>(new[] { Fakes.User }) };\nStubPackageRegistration = new PackageRegistration { Key = 0, Id = \"anId\" };\n- OwinContext = Fakes.CreateOwinContext();\n+ SetOwinContextOverride(Fakes.CreateOwinContext());\nEntitiesContext = new FakeEntitiesContext();\nEntitiesContext.CuratedFeeds.Add(StubCuratedFeed);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "using System;\nusing System.Collections.Generic;\n-using System.Globalization;\nusing System.IO;\nusing System.Linq;\nusing System.Net.Mail;\n@@ -97,7 +96,7 @@ public class PackagesControllerFacts\nauditingService);\ncontroller.CallBase = true;\n- controller.Object.OwinContext = Fakes.CreateOwinContext();\n+ controller.Object.SetOwinContextOverride(Fakes.CreateOwinContext());\nhttpContext = httpContext ?? new Mock<HttpContextBase>();\nTestUtility.SetupHttpContextMockForUrlGeneration(httpContext, controller.Object);\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Framework/TestContainer.cs",
"new_path": "tests/NuGetGallery.Facts/Framework/TestContainer.cs",
"diff": "using System.Web.Mvc;\nusing System.Web.Routing;\nusing Autofac;\n-using Microsoft.Owin;\nusing Moq;\nusing NuGetGallery.Configuration;\n@@ -47,7 +46,7 @@ protected TestContainer(IContainer container)\nvar appCtrl = c as AppController;\nif (appCtrl != null)\n{\n- appCtrl.OwinContext = Container.Resolve<IOwinContext>();\n+ appCtrl.SetOwinContextOverride(Fakes.CreateOwinContext());\nappCtrl.NuGetContext.Config = Container.Resolve<IGalleryConfigurationService>();\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
refactor test hook (#3580)
|
455,794 |
07.03.2017 16:20:00
| 28,800 |
1b6b5b0d447066599138b83ba94e9de045228cf1
|
IsLatest Fix: wrong connection string passed to retry context
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/PackageService.cs",
"new_path": "src/NuGetGallery/Services/PackageService.cs",
"diff": "using NuGet.Packaging;\nusing NuGet.Versioning;\nusing NuGetGallery.Auditing;\n+using NuGetGallery.Configuration;\nusing NuGetGallery.Diagnostics;\nusing NuGetGallery.Packaging;\n@@ -25,6 +26,7 @@ public class PackageService : IPackageService\nprivate readonly IIndexingService _indexingService;\nprivate readonly IEntitiesContext _entitiesContext;\n+ private readonly IAppConfiguration _configuration;\nprivate readonly IEntityRepository<PackageOwnerRequest> _packageOwnerRequestRepository;\nprivate readonly IEntityRepository<PackageRegistration> _packageRegistrationRepository;\nprivate readonly IEntityRepository<Package> _packageRepository;\n@@ -37,6 +39,7 @@ public class PackageService : IPackageService\nIEntityRepository<Package> packageRepository,\nIEntityRepository<PackageOwnerRequest> packageOwnerRequestRepository,\nIEntitiesContext entitiesContext,\n+ IAppConfiguration configuration,\nIDiagnosticsService diagnostics,\nIIndexingService indexingService,\nIPackageNamingConflictValidator packageNamingConflictValidator,\n@@ -57,6 +60,16 @@ public class PackageService : IPackageService\nthrow new ArgumentNullException(nameof(packageOwnerRequestRepository));\n}\n+ if (entitiesContext == null)\n+ {\n+ throw new ArgumentNullException(nameof(entitiesContext));\n+ }\n+\n+ if (configuration == null)\n+ {\n+ throw new ArgumentNullException(nameof(configuration));\n+ }\n+\nif (indexingService == null)\n{\nthrow new ArgumentNullException(nameof(indexingService));\n@@ -76,6 +89,7 @@ public class PackageService : IPackageService\n_packageRepository = packageRepository;\n_packageOwnerRequestRepository = packageOwnerRequestRepository;\n_entitiesContext = entitiesContext;\n+ _configuration = configuration;\n_indexingService = indexingService;\n_packageNamingConflictValidator = packageNamingConflictValidator;\n_auditingService = auditingService;\n@@ -780,7 +794,7 @@ private Task<bool> TryUpdateIsLatestAsync(IEntitiesContext context, PackageRegis\nprotected internal virtual IEntitiesContext CreateNewEntitiesContext()\n{\n- return new EntitiesContext();\n+ return new EntitiesContext(_configuration.SqlConnectionString, readOnly: false);\n}\npublic async Task UpdateIsLatestAsync(PackageRegistration packageRegistration)\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs",
"diff": "using NuGet.Packaging;\nusing NuGet.Versioning;\nusing NuGetGallery.Auditing;\n+using NuGetGallery.Configuration;\nusing NuGetGallery.Diagnostics;\nusing NuGetGallery.Framework;\nusing NuGetGallery.Packaging;\n@@ -100,6 +101,7 @@ public class PackageServiceFacts\nMock<IEntityRepository<Package>> packageRepository = null,\nMock<IEntityRepository<PackageOwnerRequest>> packageOwnerRequestRepo = null,\nMock<IEntitiesContext> entitiesContext = null,\n+ Mock<IAppConfiguration> configuration = null,\nMock<IDiagnosticsService> diagnosticsService = null,\nMock<IIndexingService> indexingService = null,\nIPackageNamingConflictValidator packageNamingConflictValidator = null,\n@@ -111,6 +113,7 @@ public class PackageServiceFacts\npackageRepository,\npackageOwnerRequestRepo,\nentitiesContext,\n+ configuration,\ndiagnosticsService,\nindexingService,\npackageNamingConflictValidator,\n@@ -123,6 +126,7 @@ public class PackageServiceFacts\nMock<IEntityRepository<Package>> packageRepository = null,\nMock<IEntityRepository<PackageOwnerRequest>> packageOwnerRequestRepo = null,\nMock<IEntitiesContext> entitiesContext = null,\n+ Mock<IAppConfiguration> configuration = null,\nMock<IDiagnosticsService> diagnosticsService = null,\nMock<IIndexingService> indexingService = null,\nIPackageNamingConflictValidator packageNamingConflictValidator = null,\n@@ -138,6 +142,8 @@ public class PackageServiceFacts\nentitiesContext.Setup(m => m.GetDatabase()).Returns(dbContext.Object.Database);\nentitiesContext.Setup(m => m.GetChangeTracker()).Returns(dbContext.Object.ChangeTracker);\n+ configuration = configuration ?? new Mock<IAppConfiguration>();\n+\ndiagnosticsService = diagnosticsService ?? new Mock<IDiagnosticsService>();\nindexingService = indexingService ?? new Mock<IIndexingService>();\nauditingService = auditingService ?? new TestAuditingService();\n@@ -154,6 +160,7 @@ public class PackageServiceFacts\npackageRepository.Object,\npackageOwnerRequestRepo.Object,\nentitiesContext.Object,\n+ configuration.Object,\ndiagnosticsService.Object,\nindexingService.Object,\npackageNamingConflictValidator,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs",
"diff": "using System.Threading.Tasks;\nusing Moq;\nusing NuGet.Packaging;\n+using NuGetGallery.Configuration;\nusing NuGetGallery.Diagnostics;\nusing NuGetGallery.Framework;\nusing NuGetGallery.Packaging;\n@@ -285,6 +286,7 @@ private static Mock<PackageService> SetupPackageService(Package package)\nvar packageOwnerRequestRepo = new Mock<IEntityRepository<PackageOwnerRequest>>();\nvar diagnosticsService = new Mock<IDiagnosticsService>();\nvar entitiesContext = new Mock<IEntitiesContext>();\n+ var configuration = new Mock<IAppConfiguration>();\nvar indexingService = new Mock<IIndexingService>();\nvar packageNamingConflictValidator = new PackageNamingConflictValidator(\npackageRegistrationRepository.Object,\n@@ -296,6 +298,7 @@ private static Mock<PackageService> SetupPackageService(Package package)\npackageRepository.Object,\npackageOwnerRequestRepo.Object,\nentitiesContext.Object,\n+ configuration.Object,\ndiagnosticsService.Object,\nindexingService.Object,\npackageNamingConflictValidator,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "@@ -113,12 +113,21 @@ public async Task PackageLatestSetCorrectlyOnConcurrentPushes()\n\"7.0.0-a\", \"7.0.0-b\", \"7.0.0\", \"7.0.1\", \"7.0.2-abc\"\n};\n- // push all and verify; ~15-20 concurrency conflicts seen in testing\n+ // first push should not be concurrent to avoid conflict on creation of package registration.\nvar concurrentTasks = new Task[packageVersions.Count];\n- for (int i = 0; i < concurrentTasks.Length; i++)\n+ concurrentTasks[0] = Task.Run(() => _clientSdkHelper.UploadNewPackage(packageId, version: packageVersions[0]));\n+ concurrentTasks[0].Wait();\n+\n+ // push remaining packages over period of 5 seconds\n+ var random = new Random();\n+ for (int i = 1; i < concurrentTasks.Length; i++)\n{\nvar packageVersion = packageVersions[i];\n- concurrentTasks[i] = Task.Run(() => _clientSdkHelper.UploadNewPackage(packageId, version: packageVersion));\n+ concurrentTasks[i] = Task.Run(async () =>\n+ {\n+ await Task.Delay(random.Next(0, 5000));\n+ await _clientSdkHelper.UploadNewPackage(packageId, version: packageVersion);\n+ });\n}\nTask.WaitAll(concurrentTasks);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
IsLatest Fix: wrong connection string passed to retry context (#3632)
|
455,772 |
07.03.2017 17:36:01
| 28,800 |
cf34a1c2fad7d6010a7352cc9c323b4b5248eecf
|
Send e-mail when a new API key is created
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/UsersController.cs",
"new_path": "src/NuGetGallery/Controllers/UsersController.cs",
"diff": "@@ -580,6 +580,8 @@ public virtual async Task<ActionResult> GenerateApiKey(string description, strin\nvar credentialViewModel = _authService.DescribeCredential(newCredential);\ncredentialViewModel.Value = newCredential.Value;\n+ _messageService.SendCredentialAddedNotice(GetCurrentUser(), newCredential);\n+\nreturn Json(credentialViewModel);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -715,6 +715,26 @@ public async Task ReturnsNewCredentialJson()\nAssert.Equal(apiKey.Description, credentialViewModel.Description);\nAssert.Equal(apiKey.Expires, credentialViewModel.Expires);\n}\n+\n+ [Fact]\n+ public async Task SendsNotificationMailToUser()\n+ {\n+ var user = new User { Username = \"the-username\" };\n+\n+ var controller = GetController<UsersController>();\n+ controller.SetCurrentUser(user);\n+\n+ var result = await controller.GenerateApiKey(\n+ description: \"description\",\n+ scopes: new[] { NuGetScopes.PackageUnlist, NuGetScopes.PackagePush },\n+ subjects: new[] { \"a\" },\n+ expirationInDays: 90);\n+\n+ var apiKey = user.Credentials.FirstOrDefault(x => x.Type == CredentialTypes.ApiKey.V2);\n+\n+ GetMock<IMessageService>()\n+ .Verify(m => m.SendCredentialAddedNotice(user, apiKey));\n+ }\n}\npublic class TheChangeEmailAction : TestContainer\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Send e-mail when a new API key is created (#3634)
|
455,747 |
09.03.2017 15:36:08
| 28,800 |
a163efabf37a198c47a8bce9c73c35fb95298b94
|
Fix Microsoft Account removal
Fix the cshtml; add tests
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"new_path": "src/NuGetGallery/Views/Users/Account.cshtml",
"diff": "@item.ExpandLink(\"More Info\", \"Less Info\")\n@if (loginCredentials > 1)\n{\n- using (Html.BeginForm(\"RemoveCredential\", \"Users\", new { credentialType = cred.Type }, FormMethod.Post, new { @class = \"form-inline\" }))\n+ using (Html.BeginForm(\"RemoveCredential\", \"Users\", new { credentialType = cred.Type, credentialKey = cred.Key }, FormMethod.Post, new { @class = \"form-inline\" }))\n{\n<fieldset class=\"form\">\n<legend>Remove @cred.TypeCaption Credential</legend>\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs",
"diff": "@@ -1221,6 +1221,36 @@ public async Task GivenValidRequest_ItRemovesCredAndSendsNotificationToUser()\nGetMock<AuthenticationService>().VerifyAll();\nGetMock<IMessageService>().VerifyAll();\n}\n+\n+ [Fact]\n+ public async Task GivenValidRequest_CanDeleteMicrosoftAccountWithMultipleMicrosoftAccounts()\n+ {\n+ // Arrange\n+ var fakes = Get<Fakes>();\n+ var creds = new Credential[5];\n+ for (int i = 0; i < creds.Length; i++) {\n+ creds[i] = new CredentialBuilder().CreateExternalCredential(\"MicrosoftAccount\", \"blorg\", \"bloog\" + i);\n+ creds[i].Key = i + 1;\n+ }\n+\n+ var user = fakes.CreateUser(\"test\", creds);\n+ var controller = GetController<UsersController>();\n+ controller.SetCurrentUser(user);\n+ Assert.Equal(creds.Length, user.Credentials.Count);\n+\n+ for (int i = 0; i < creds.Length - 1; i++)\n+ {\n+ // Act\n+ var result = await controller.RemoveCredential(\n+ credentialType: creds[i].Type,\n+ credentialKey: creds[i].Key);\n+\n+ // Assert\n+ ResultAssert.IsRedirectToRoute(result, new { action = \"Account\" });\n+ Assert.Equal(Strings.CredentialRemoved, controller.TempData[\"Message\"]);\n+ Assert.Equal(creds.Length - i - 1, user.Credentials.Count);\n+ }\n+ }\n}\npublic class TheRegenerateCredentialAction : TestContainer\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix Microsoft Account removal (#3639)
Fix the cshtml; add tests
|
455,794 |
10.03.2017 10:23:45
| 28,800 |
00fb3fb2d811e11e05e437b08fbc8171c7fcde0c
|
Fix concurrent push test by disabling search hijacking on feed
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "@@ -211,6 +211,7 @@ private async Task CheckPackageLatestVersions(string packageId, List<string> ver\nforeach (var version in versions)\n{\nvar feedUrl = $\"{UrlHelper.V2FeedRootUrl}/Packages?$filter=Id eq '{packageId}' and Version eq '{version}'\" +\n+ \"and 1 eq 1\" + // Disable search hijacking to get immediate results.\n\"&$select=Id,Version,IsLatestVersion,IsAbsoluteLatestVersion\";\nvar packageDetails = await _odataHelper.GetPackagePropertiesFromResponse(feedUrl, packageId, version);\nAssert.NotNull(packageDetails);\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Fix concurrent push test by disabling search hijacking on feed (#3641)
|
455,794 |
16.03.2017 08:49:20
| 25,200 |
68a704669210c50efb444b096a2f1cb2e6387c9b
|
Telemetry for temp keys
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Constants.cs",
"new_path": "src/NuGetGallery/Constants.cs",
"diff": "@@ -52,6 +52,7 @@ public static class Constants\npublic const string UrlValidationErrorMessage = \"This doesn't appear to be a valid HTTP/HTTPS URL\";\ninternal const string ApiKeyHeaderName = \"X-NuGet-ApiKey\";\n+ internal const string ClientVersionHeaderName = \"X-NuGet-Client-Version\";\ninternal const string WarningHeaderName = \"X-NuGet-Warning\";\npublic static readonly string ReturnUrlParameterName = \"ReturnUrl\";\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/ApiController.cs",
"new_path": "src/NuGetGallery/Controllers/ApiController.cs",
"diff": "@@ -219,7 +219,10 @@ public async virtual Task<ActionResult> CreatePackageVerificationKeyAsync(string\n// validation until the VerifyPackageKey call.\nvar credential = CredentialBuilder.CreatePackageVerificationApiKey(id);\n- await AuthenticationService.AddCredential(GetCurrentUser(), credential);\n+ var user = GetCurrentUser();\n+ await AuthenticationService.AddCredential(user, credential);\n+\n+ TelemetryService.TrackCreatePackageVerificationKeyEvent(id, version, user, User.Identity);\nreturn Json(new\n{\n@@ -246,10 +249,12 @@ public async virtual Task<ActionResult> VerifyPackageKeyAsync(string id, string\nawait AuthenticationService.RemoveCredential(user, credential);\n}\n- return result;\n+ TelemetryService.TrackVerifyPackageKeyEvent(id, version, user, User.Identity, result?.StatusCode ?? 200);\n+\n+ return (ActionResult)result ?? new EmptyResult();\n}\n- private ActionResult VerifyPackageKeyInternal(User user, Credential credential, string id, string version)\n+ private HttpStatusCodeWithBodyResult VerifyPackageKeyInternal(User user, Credential credential, string id, string version)\n{\n// Verify that the user has permission to push for the specific Id \\ version combination.\nvar package = PackageService.FindPackageByIdAndVersion(id, version);\n@@ -281,7 +286,7 @@ private ActionResult VerifyPackageKeyInternal(User user, Credential credential,\n}\n}\n- return new EmptyResult();\n+ return null;\n}\n[HttpPut]\n@@ -483,7 +488,7 @@ private async Task<ActionResult> CreatePackageInternal()\nUrl.Action(\"ReportMyPackage\", \"Packages\", routeValues: new { id = package.PackageRegistration.Id, version = package.Version }, protocol: Request.Url.Scheme),\nUrl.Action(\"Account\", \"Users\", routeValues: null, protocol: Request.Url.Scheme));\n- TelemetryService.TrackPackagePushEvent(user, User.Identity);\n+ TelemetryService.TrackPackagePushEvent(package, user, User.Identity);\nreturn new HttpStatusCodeResult(HttpStatusCode.Created);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"new_path": "src/NuGetGallery/Controllers/PackagesController.cs",
"diff": "@@ -1224,7 +1224,7 @@ public virtual async Task<ActionResult> VerifyPackage(VerifyPackageRequest formD\n// delete the uploaded binary in the Uploads container\nawait _uploadFileService.DeleteUploadFileAsync(currentUser.Key);\n- _telemetryService.TrackPackagePushEvent(currentUser, User.Identity);\n+ _telemetryService.TrackPackagePushEvent(package, currentUser, User.Identity);\nTempData[\"Message\"] = String.Format(\nCultureInfo.CurrentCulture, Strings.SuccessfullyUploadedPackage, package.PackageRegistration.Id, package.Version);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/ExtensionMethods.cs",
"new_path": "src/NuGetGallery/ExtensionMethods.cs",
"diff": "@@ -389,20 +389,28 @@ public static string GetAuthenticationType(this IIdentity self)\nreturn identity?.GetClaimOrDefault(ClaimTypes.AuthenticationMethod);\n}\n- public static bool IsScopedAuthentication(this IIdentity self)\n+ private static string GetScopeClaim(this IIdentity self)\n{\nvar identity = self as ClaimsIdentity;\n- if (identity == null)\n- {\n- return false;\n+ return identity?.GetClaimOrDefault(NuGetClaims.Scope);\n}\n- var scopeClaim = identity.GetClaimOrDefault(NuGetClaims.Scope);\n+ public static bool IsScopedAuthentication(this IIdentity self)\n+ {\n+ var scopeClaim = self.GetScopeClaim();\nreturn !ScopeEvaluator.IsEmptyScopeClaim(scopeClaim);\n}\n+ public static bool HasVerifyScope(this IIdentity self)\n+ {\n+ var scopeClaim = self.GetScopeClaim();\n+\n+ return ScopeEvaluator.ScopeClaimsAllowsActionForSubject(scopeClaim, subject: null,\n+ requestedActions: new [] { NuGetScopes.PackageVerify });\n+ }\n+\n// This is a method because the first call will perform a database call\n/// <summary>\n/// Get the current user, from the database, or if someone in this request has already\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"new_path": "src/NuGetGallery/Services/ITelemetryService.cs",
"diff": "@@ -9,6 +9,10 @@ public interface ITelemetryService\n{\nvoid TrackODataQueryFilterEvent(string callContext, bool isEnabled, bool isAllowed, string queryPattern);\n- void TrackPackagePushEvent(User user, IIdentity identity);\n+ void TrackPackagePushEvent(Package package, User user, IIdentity identity);\n+\n+ void TrackCreatePackageVerificationKeyEvent(string packageId, string packageVersion, User user, IIdentity identity);\n+\n+ void TrackVerifyPackageKeyEvent(string packageId, string packageVersion, User user, IIdentity identity, int statusCode);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Services/TelemetryService.cs",
"new_path": "src/NuGetGallery/Services/TelemetryService.cs",
"diff": "using System;\nusing System.Collections.Generic;\nusing System.Security.Principal;\n+using System.Web;\nnamespace NuGetGallery\n{\npublic class TelemetryService : ITelemetryService\n{\n- // ODataQueryFilter\n- public const string ODataQueryFilter = \"ODataQueryFilter\";\n+ // Event types\n+ public const string ODataQueryFilterEvent = \"ODataQueryFilter\";\n+ public const string PackagePushEvent = \"PackagePush\";\n+ public const string CreatePackageVerificationKeyEvent = \"CreatePackageVerificationKeyEvent\";\n+ public const string VerifyPackageKeyEvent = \"VerifyPackageKeyEvent\";\n+\n+ // ODataQueryFilter properties\npublic const string CallContext = \"CallContext\";\npublic const string IsEnabled = \"IsEnabled\";\npublic const string IsAllowed = \"IsAllowed\";\npublic const string QueryPattern = \"QueryPattern\";\n- // Package push\n- public const string PackagePush = \"PackagePush\";\n- public const string AuthenticatinMethod = \"AuthenticationMethod\";\n+ // Package push properties\n+ public const string AuthenticationMethod = \"AuthenticationMethod\";\npublic const string AccountCreationDate = \"AccountCreationDate\";\n+ public const string ClientVersion = \"ClientVersion\";\npublic const string IsScoped = \"IsScoped\";\n+ public const string PackageId = \"PackageId\";\n+ public const string PackageVersion = \"PackageVersion\";\n+\n+ // Verify package properties\n+ public const string IsVerificationKeyUsed = \"IsVerificationKeyUsed\";\n+ public const string VerifyPackageKeyStatusCode = \"VerifyPackageKeyStatusCode\";\npublic void TrackODataQueryFilterEvent(string callContext, bool isEnabled, bool isAllowed, string queryPattern)\n{\n- var telemetryProperties = new Dictionary<string, string>();\n+ TrackEvent(ODataQueryFilterEvent, properties =>\n+ {\n+ properties.Add(CallContext, callContext);\n+ properties.Add(IsEnabled, $\"{isEnabled}\");\n- telemetryProperties.Add(CallContext, callContext);\n- telemetryProperties.Add(IsEnabled, $\"{isEnabled}\");\n+ properties.Add(IsAllowed, $\"{isAllowed}\");\n+ properties.Add(QueryPattern, queryPattern);\n+ });\n+ }\n- telemetryProperties.Add(IsAllowed, $\"{isAllowed}\");\n- telemetryProperties.Add(QueryPattern, queryPattern);\n+ public void TrackPackagePushEvent(Package package, User user, IIdentity identity)\n+ {\n+ if (package == null)\n+ {\n+ throw new ArgumentNullException(nameof(package));\n+ }\n- Telemetry.TrackEvent(ODataQueryFilter, telemetryProperties, metrics: null);\n+ if (user == null)\n+ {\n+ throw new ArgumentNullException(nameof(user));\n}\n- public void TrackPackagePushEvent(User user, IIdentity identity)\n+ if (identity == null)\n+ {\n+ throw new ArgumentNullException(nameof(identity));\n+ }\n+\n+ TrackEvent(PackagePushEvent, properties => {\n+ properties.Add(ClientVersion, GetClientVersion());\n+ properties.Add(PackageId, package.PackageRegistration.Id);\n+ properties.Add(PackageVersion, package.Version);\n+ properties.Add(AuthenticationMethod, identity.GetAuthenticationType());\n+ properties.Add(AccountCreationDate, GetAccountCreationDate(user));\n+ properties.Add(IsScoped, identity.IsScopedAuthentication().ToString());\n+ });\n+ }\n+\n+ public void TrackCreatePackageVerificationKeyEvent(string packageId, string packageVersion, User user, IIdentity identity)\n{\nif (user == null)\n{\n@@ -47,15 +85,53 @@ public void TrackPackagePushEvent(User user, IIdentity identity)\nthrow new ArgumentNullException(nameof(identity));\n}\n- string authenticationMethod = identity.GetAuthenticationType();\n- bool isScoped = identity.IsScopedAuthentication();\n+ TrackEvent(CreatePackageVerificationKeyEvent, properties => {\n+ properties.Add(ClientVersion, GetClientVersion());\n+ properties.Add(PackageId, packageId);\n+ properties.Add(PackageVersion, packageVersion);\n+ properties.Add(AccountCreationDate, GetAccountCreationDate(user));\n+ properties.Add(IsScoped, identity.IsScopedAuthentication().ToString());\n+ });\n+ }\n+ public void TrackVerifyPackageKeyEvent(string packageId, string packageVersion, User user, IIdentity identity, int statusCode)\n+ {\n+ if (user == null)\n+ {\n+ throw new ArgumentNullException(nameof(user));\n+ }\n+\n+ if (identity == null)\n+ {\n+ throw new ArgumentNullException(nameof(identity));\n+ }\n+\n+ TrackEvent(VerifyPackageKeyEvent, properties =>\n+ {\n+ properties.Add(PackageId, packageId);\n+ properties.Add(PackageVersion, packageVersion);\n+ properties.Add(IsVerificationKeyUsed, identity.HasVerifyScope().ToString());\n+ properties.Add(VerifyPackageKeyStatusCode, statusCode.ToString());\n+ });\n+ }\n+\n+ private static string GetClientVersion()\n+ {\n+ return HttpContext.Current?.Request?.Headers[Constants.ClientVersionHeaderName];\n+ }\n+\n+ private static string GetAccountCreationDate(User user)\n+ {\n+ return user.CreatedUtc != null ? user.CreatedUtc.Value.ToString(\"d\") : \"N/A\";\n+ }\n+\n+ private static void TrackEvent(string eventName, Action<Dictionary<string, string>> addProperties)\n+ {\nvar telemetryProperties = new Dictionary<string, string>();\n- telemetryProperties.Add(AuthenticatinMethod, authenticationMethod);\n- telemetryProperties.Add(AccountCreationDate, user.CreatedUtc != null ? user.CreatedUtc.Value.ToString(\"d\") : \"N/A\");\n- telemetryProperties.Add(IsScoped, isScoped.ToString());\n- Telemetry.TrackEvent(PackagePush, telemetryProperties, metrics: null);\n+ addProperties(telemetryProperties);\n+\n+ Telemetry.TrackEvent(eventName, telemetryProperties, metrics: null);\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs",
"diff": "@@ -631,7 +631,7 @@ public async Task WillSendPackagePushEvent()\nawait controller.CreatePackagePut();\n- controller.MockTelemetryService.Verify(x => x.TrackPackagePushEvent(user, controller.OwinContext.Request.User.Identity), Times.Once);\n+ controller.MockTelemetryService.Verify(x => x.TrackPackagePushEvent(It.IsAny<Package>(), user, controller.OwinContext.Request.User.Identity), Times.Once);\n}\n}\n@@ -1059,6 +1059,9 @@ public async void CreatePackageKeyReturnsPackageVerificationKey(string scope)\nAssert.True(DateTime.TryParse(json.Expires, out expires));\ncontroller.MockAuthenticationService.Verify(s => s.AddCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Once);\n+\n+ controller.MockTelemetryService.Verify(x => x.TrackCreatePackageVerificationKeyEvent(\"foo\", \"1.0.0\",\n+ It.IsAny<User>(), controller.OwinContext.Request.User.Identity), Times.Once);\n}\n}\n@@ -1083,6 +1086,9 @@ public async void VerifyPackageKeyReturns404IfPackageDoesNotExist_ApiKeyV2(strin\nString.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, \"foo\", \"1.0.0\"));\ncontroller.MockAuthenticationService.Verify(s => s.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Never);\n+\n+ controller.MockTelemetryService.Verify(x => x.TrackVerifyPackageKeyEvent(\"foo\", \"1.0.0\",\n+ It.IsAny<User>(), controller.OwinContext.Request.User.Identity, 404), Times.Once);\n}\n[Theory]\n@@ -1102,6 +1108,9 @@ public async void VerifyPackageKeyReturns404IfPackageDoesNotExist_ApiKeyVerifyV1\nString.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, \"foo\", \"1.0.0\"));\ncontroller.MockAuthenticationService.Verify(s => s.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Once);\n+\n+ controller.MockTelemetryService.Verify(x => x.TrackVerifyPackageKeyEvent(\"foo\", \"1.0.0\",\n+ It.IsAny<User>(), controller.OwinContext.Request.User.Identity, 404), Times.Once);\n}\n[Theory]\n@@ -1128,6 +1137,9 @@ public async void VerifyPackageKeyReturns403IfUserIsNotAnOwner_ApiKeyV2(string s\nStrings.ApiKeyNotAuthorized);\ncontroller.MockAuthenticationService.Verify(s => s.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Never);\n+\n+ controller.MockTelemetryService.Verify(x => x.TrackVerifyPackageKeyEvent(\"foo\", \"1.0.0\",\n+ It.IsAny<User>(), controller.OwinContext.Request.User.Identity, 403), Times.Once);\n}\n[Theory]\n@@ -1152,6 +1164,9 @@ public async void VerifyPackageKeyReturns403IfUserIsNotAnOwner_ApiKeyVerifyV1(st\nStrings.ApiKeyNotAuthorized);\ncontroller.MockAuthenticationService.Verify(s => s.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Once);\n+\n+ controller.MockTelemetryService.Verify(x => x.TrackVerifyPackageKeyEvent(\"foo\", \"1.0.0\",\n+ It.IsAny<User>(), controller.OwinContext.Request.User.Identity, 403), Times.Once);\n}\n[Theory]\n@@ -1181,6 +1196,9 @@ public async void VerifyPackageKeyReturns403IfScopeDoesNotMatch_ApiKeyV2(string\nStrings.ApiKeyNotAuthorized);\ncontroller.MockAuthenticationService.Verify(s => s.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Never);\n+\n+ controller.MockTelemetryService.Verify(x => x.TrackVerifyPackageKeyEvent(\"foo\", \"1.0.0\",\n+ It.IsAny<User>(), controller.OwinContext.Request.User.Identity, 403), Times.Once);\n}\n[Theory]\n@@ -1210,6 +1228,9 @@ public async void VerifyPackageKeyReturns403IfScopeDoesNotMatch_ApiKeyVerifyV1(s\nStrings.ApiKeyNotAuthorized);\ncontroller.MockAuthenticationService.Verify(s => s.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Once);\n+\n+ controller.MockTelemetryService.Verify(x => x.TrackVerifyPackageKeyEvent(\"foo\", \"1.0.0\",\n+ It.IsAny<User>(), controller.OwinContext.Request.User.Identity, 403), Times.Once);\n}\n[Theory]\n@@ -1233,6 +1254,9 @@ public async void VerifyPackageKeyReturns200_ApiKeyV2(string scope)\nResultAssert.IsEmpty(result);\ncontroller.MockAuthenticationService.Verify(s => s.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Never);\n+\n+ controller.MockTelemetryService.Verify(x => x.TrackVerifyPackageKeyEvent(\"foo\", \"1.0.0\",\n+ It.IsAny<User>(), controller.OwinContext.Request.User.Identity, 200), Times.Once);\n}\n[Theory]\n@@ -1254,6 +1278,9 @@ public async void VerifyPackageKeyReturns200_ApiKeyVerifyV1(string scope)\nResultAssert.IsEmpty(result);\ncontroller.MockAuthenticationService.Verify(s => s.RemoveCredential(It.IsAny<User>(), It.IsAny<Credential>()), Times.Once);\n+\n+ controller.MockTelemetryService.Verify(x => x.TrackVerifyPackageKeyEvent(\"foo\", \"1.0.0\",\n+ It.IsAny<User>(), controller.OwinContext.Request.User.Identity, 200), Times.Once);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"new_path": "tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs",
"diff": "@@ -1879,7 +1879,7 @@ public async Task WillSendPackagePublishedEvent()\nawait controller.VerifyPackage(new VerifyPackageRequest { Listed = true, Edit = null });\n// Assert\n- fakeTelemetryService.Verify(x => x.TrackPackagePushEvent(TestUtility.FakeUser, controller.OwinContext.Request.User.Identity), Times.Once);\n+ fakeTelemetryService.Verify(x => x.TrackPackagePushEvent(It.IsAny<Package>(), TestUtility.FakeUser, controller.OwinContext.Request.User.Identity), Times.Once);\n}\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Telemetry for temp keys (#3662)
|
455,794 |
16.03.2017 15:15:32
| 25,200 |
5e9b0ed80ce1d5bf8c636956b22db99c2a8319e3
|
Functional test for temp keys
|
[
{
"change_type": "MODIFY",
"old_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"new_path": "tests/NuGetGallery.FunctionalTests/ODataFeeds/V2FeedExtendedTests.cs",
"diff": "using System.IO;\nusing System.Linq;\nusing System.Net;\n-using System.Threading;\nusing System.Threading.Tasks;\n+using Newtonsoft.Json.Linq;\nusing Xunit;\nusing Xunit.Abstractions;\n@@ -343,5 +343,91 @@ public async Task PackageFeedSortingTest()\nAssert.True(condition, \"Expected string \" + packageName[i - 1] + \" to come before \" + packageName[i] + \". Expected list is: \" + packageName[0] + \", \" + packageName[1] + \", \" + packageName[2] + \", \" + packageName[3] + \", \" + packageName[4] + \", \" + packageName[5] + \", \" + packageName[6] + \", \" + packageName[7] + \", \" + packageName[8] + \", \" + packageName[9]);\n}\n}\n+\n+ [Fact]\n+ [Description(\"VerifyPackageKey fails if package isn't found.\")]\n+ [Priority(1)]\n+ [Category(\"P1Tests\")]\n+ public async Task VerifyPackageKeyReturns404ForMissingPackage()\n+ {\n+ Assert.Equal(HttpStatusCode.NotFound, await VerifyPackageKey(EnvironmentSettings.TestAccountApiKey, \"VerifyPackageKeyReturns404ForMissingPackage\", \"1.0.0\"));\n+ }\n+\n+ [Fact]\n+ [Description(\"VerifyPackageKey succeeds for full API key without deletion.\")]\n+ [Priority(1)]\n+ [Category(\"P1Tests\")]\n+ public async Task VerifyPackageKeyReturns200ForFullApiKey()\n+ {\n+ var packageId = $\"VerifyPackageKeyReturns200ForFullApiKey.{DateTimeOffset.UtcNow.Ticks}\";\n+ var packageVersion = \"1.0.0\";\n+\n+ await _clientSdkHelper.UploadNewPackage(packageId, packageVersion);\n+\n+ Assert.Equal(HttpStatusCode.OK, await VerifyPackageKey(EnvironmentSettings.TestAccountApiKey, packageId));\n+ Assert.Equal(HttpStatusCode.OK, await VerifyPackageKey(EnvironmentSettings.TestAccountApiKey, packageId, packageVersion));\n+ }\n+\n+ [Fact]\n+ [Description(\"VerifyPackageKey succeeds for temp API key with deletion.\")]\n+ [Priority(1)]\n+ [Category(\"P1Tests\")]\n+ public async Task VerifyPackageKeyReturns200ForTempApiKey()\n+ {\n+ var packageId = $\"VerifyPackageKeySupportsFullAndTempApiKeys.{DateTimeOffset.UtcNow.Ticks}\";\n+ var packageVersion = \"1.0.0\";\n+\n+ await _clientSdkHelper.UploadNewPackage(packageId, packageVersion);\n+\n+ var verificationKey = await CreateVerificationKey(packageId, packageVersion);\n+\n+ Assert.Equal(HttpStatusCode.OK, await VerifyPackageKey(verificationKey, packageId, packageVersion));\n+ Assert.Equal(HttpStatusCode.Forbidden, await VerifyPackageKey(verificationKey, packageId, packageVersion));\n+ }\n+\n+ private async Task<string> CreateVerificationKey(string packageId, string packageVersion)\n+ {\n+ var request = WebRequest.Create(UrlHelper.V2FeedRootUrl + $\"package/create-verification-key/{packageId}/{packageVersion}\");\n+ request.Method = \"POST\";\n+ request.ContentLength = 0;\n+ request.Headers.Add(\"X-NuGet-ApiKey\", EnvironmentSettings.TestAccountApiKey);\n+ request.Headers.Add(\"X-NuGet-Client-Version\", \"NuGetGallery.FunctionalTests\");\n+\n+ var response = await request.GetResponseAsync() as HttpWebResponse;\n+ Assert.NotNull(response);\n+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);\n+\n+ string responseText;\n+ using (var sr = new StreamReader(response.GetResponseStream()))\n+ {\n+ responseText = await sr.ReadToEndAsync();\n+ }\n+\n+ var json = JObject.Parse(responseText);\n+ var expiration = json.Value<DateTime>(\"Expires\");\n+ Assert.True(expiration - DateTime.UtcNow < TimeSpan.FromDays(1), \"Verification keys should expire after 1 day.\");\n+\n+ return json.Value<string>(\"Key\");\n+ }\n+\n+ private async Task<HttpStatusCode> VerifyPackageKey(string apiKey, string packageId, string packageVersion = null)\n+ {\n+ var route = string.IsNullOrWhiteSpace(packageVersion) ?\n+ $\"verifykey/{packageId}\" :\n+ $\"verifykey/{packageId}/{packageVersion}\";\n+\n+ var request = WebRequest.Create(UrlHelper.V2FeedRootUrl + route);\n+ request.Headers.Add(\"X-NuGet-ApiKey\", apiKey);\n+\n+ try\n+ {\n+ var response = await request.GetResponseAsync() as HttpWebResponse;\n+ return response.StatusCode;\n+ }\n+ catch (WebException e)\n+ {\n+ return ((HttpWebResponse)e.Response).StatusCode;\n+ }\n+ }\n}\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Functional test for temp keys (#3664)
|
455,731 |
17.03.2017 09:28:02
| 25,200 |
d424e79c2bde12ab3a39953b1004d39f1cee86f3
|
Add credential to Register and RequestPasswordReset audits
|
[
{
"change_type": "MODIFY",
"old_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"new_path": "src/NuGetGallery/Authentication/AuthenticationService.cs",
"diff": "@@ -295,7 +295,7 @@ public virtual async Task<AuthenticatedUser> Register(string username, string em\n}\n// Write an audit record\n- await Auditing.SaveAuditRecordAsync(new UserAuditRecord(newUser, AuditedUserAction.Register));\n+ await Auditing.SaveAuditRecordAsync(new UserAuditRecord(newUser, AuditedUserAction.Register, credential));\nEntities.Users.Add(newUser);\nawait Entities.SaveChangesAsync();\n@@ -399,7 +399,10 @@ public virtual async Task GeneratePasswordResetToken(User user, int expirationIn\nuser.PasswordResetToken = CryptographyService.GenerateToken();\nuser.PasswordResetTokenExpirationDate = _dateTimeProvider.UtcNow.AddMinutes(expirationInMinutes);\n- await Auditing.SaveAuditRecordAsync(new UserAuditRecord(user, AuditedUserAction.RequestPasswordReset));\n+ var passwordCredential = user.Credentials.FirstOrDefault(\n+ credential => credential.Type.StartsWith(CredentialTypes.Password.Prefix, StringComparison.OrdinalIgnoreCase));\n+\n+ await Auditing.SaveAuditRecordAsync(new UserAuditRecord(user, AuditedUserAction.RequestPasswordReset, passwordCredential));\nawait Entities.SaveChangesAsync();\n}\n"
}
] |
C#
|
Apache License 2.0
|
nuget/nugetgallery
|
Add credential to Register and RequestPasswordReset audits (#3666)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.