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 |
|---|---|---|---|---|---|---|---|---|---|
734,008 | 22.12.2022 18:46:51 | 0 | d588bb0e17d4db24865fdaea95d99b8a2ebbb021 | Less_Tree_Ruleset: Fix unused variable (PhanNoopVariable)
* lib/Less/Tree/Ruleset.php:56
PhanNoopVariable Unused variable | [
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"scripts\": {\n\"test\": [\n\"parallel-lint . --exclude vendor\",\n- \"phpcs -sp\",\n\"phpunit\",\n+ \"phpcs -sp\",\n\"minus-x check .\"\n],\n\"cover\": \"phpunit --coverage-text --coverage-html coverage/ --coverage-clover coverage/clover.xml\",\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/Less/Tree/Ruleset.php",
"new_path": "lib/Less/Tree/Ruleset.php",
"diff": "@@ -53,7 +53,7 @@ class Less_Tree_Ruleset extends Less_Tree {\npublic function accept( $visitor ) {\nif ( $this->paths ) {\n$paths_len = count( $this->paths );\n- for ( $i = 0,$paths_len; $i < $paths_len; $i++ ) {\n+ for ( $i = 0; $i < $paths_len; $i++ ) {\n$this->paths[$i] = $visitor->visitArray( $this->paths[$i] );\n}\n} elseif ( $this->selectors ) {\n"
}
] | JavaScript | Apache License 2.0 | wikimedia/less.php | Less_Tree_Ruleset: Fix unused variable (PhanNoopVariable)
* lib/Less/Tree/Ruleset.php:56
PhanNoopVariable Unused variable |
734,008 | 09.01.2023 18:45:19 | 0 | 47c4714c68c9006c87676d76c172a18e1d180f60 | Tag v3.2.0
Ref | [
{
"change_type": "MODIFY",
"old_path": "CHANGES.md",
"new_path": "CHANGES.md",
"diff": "+## 3.2.0\n+\n+* [All changes](https://github.com/wikimedia/less.php/compare/v3.1.0...v3.2.0)\n+* Fix \"Implicit conversion\" PHP 8.1 warnings (Ayokunle Odusan)\n+* Fix \"Creation of dynamic property\" PHP 8.2 warnings (Bas Couwenberg)\n+* Fix \"Creation of dynamic property\" PHP 8.2 warnings (Rajesh Kumar)\n+* Tree_Url: Add support for \"Url\" type to `Parser::getVariables()` (ciroarcadio) [#51](https://github.com/wikimedia/less.php/pull/51)\n+* Tree_Import: Add support for importing URLs without file extension (Timo Tijhof) [#27](https://github.com/wikimedia/less.php/issues/27)\n+\n## 3.1.0\n* [All changes](https://github.com/wikimedia/less.php/compare/v3.0.0...v3.1.0)\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/Less/Version.php",
"new_path": "lib/Less/Version.php",
"diff": "*/\nclass Less_Version {\n- public const version = '3.1.0'; // The current build number of less.php\n+ public const version = '3.2.0'; // The current build number of less.php\npublic const less_version = '2.5.3'; // The less.js version that this build should be compatible with\npublic const cache_version = '253'; // The parser cache version\n"
}
] | JavaScript | Apache License 2.0 | wikimedia/less.php | Tag v3.2.0
Ref https://github.com/wikimedia/less.php/issues/88. |
734,021 | 02.04.2020 17:41:13 | -7,200 | 5a7160541def9a1f45c55f01b424784242d73f36 | Tree_Call: Include previous exception when catching functions
When handling a LESS syntax function, especially custom functions
registered by users of less.php, include the original exception and
trace as previous exception.
Fixes
Closes | [
{
"change_type": "MODIFY",
"old_path": "lib/Less/Tree/Call.php",
"new_path": "lib/Less/Tree/Call.php",
"diff": "@@ -66,23 +66,26 @@ class Less_Tree_Call extends Less_Tree {\n$result = null;\nif ( $nameLC === 'default' ) {\n$result = Less_Tree_DefaultFunc::compile();\n-\n} else {\n-\n- if ( method_exists( 'Less_Functions', $nameLC ) ) { // 1.\n- try {\n-\n- $func = new Less_Functions( $env, $this->currentFileInfo );\n- $result = call_user_func_array( array( $func,$nameLC ), $args );\n-\n- } catch ( Exception $e ) {\n- throw new Less_Exception_Compiler( 'error evaluating function `' . $this->name . '` '.$e->getMessage().' index: '. $this->index );\n- }\n+ $func = null;\n+ if ( method_exists( 'Less_Functions', $nameLC ) ) {\n+ $functions = new Less_Functions( $env, $this->currentFileInfo );\n+ $func = array( $functions, $nameLC );\n} elseif ( isset( $env->functions[$nameLC] ) && is_callable( $env->functions[$nameLC] ) ) {\n+ $func = $env->functions[$nameLC];\n+ }\n+ // If the function name isn't known to LESS, output it unchanged as CSS.\n+ if ( $func ) {\ntry {\n- $result = call_user_func_array( $env->functions[$nameLC], $args );\n+ $result = call_user_func_array( $func, $args );\n} catch ( Exception $e ) {\n- throw new Less_Exception_Compiler( 'error evaluating function `' . $this->name . '` '.$e->getMessage().' index: '. $this->index );\n+ // Preserve original trace, especially from custom functions.\n+ // https://github.com/wikimedia/less.php/issues/38\n+ throw new Less_Exception_Compiler(\n+ 'error evaluating function `' . $this->name . '` ' . $e->getMessage()\n+ . ' index: ' . $this->index,\n+ $e\n+ );\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "test/phpunit/FunctionTest.php",
"new_path": "test/phpunit/FunctionTest.php",
"diff": "@@ -22,4 +22,35 @@ class phpunit_FunctionTest extends phpunit_bootstrap {\nreturn $arg;\n}\n}\n+\n+ public function testException() {\n+ $lessCode = '\n+ .foo {\n+ content: number(\"x\");\n+ }\n+ ';\n+\n+ $parser = new Less_Parser();\n+ $parser->parse( $lessCode );\n+\n+ try {\n+ $parser->getCss();\n+ $this->fail();\n+ } catch ( Exception $e ) {\n+ $this->assertInstanceOf( Less_Exception_Parser::class, $e );\n+ $this->assertStringContainsString(\n+ 'error evaluating function',\n+ $e->getMessage()\n+ );\n+\n+ // Bypass PHPUnit's excectException() to assert presence and specifics\n+ // of the previous exception as well.\n+ $prev = $e->getPrevious();\n+ $this->assertInstanceOf( Less_Exception_Parser::class, $e );\n+ $this->assertStringContainsString(\n+ 'color functions take numbers as parameters',\n+ $e->getMessage()\n+ );\n+ }\n+ }\n}\n"
}
] | JavaScript | Apache License 2.0 | wikimedia/less.php | Tree_Call: Include previous exception when catching functions
When handling a LESS syntax function, especially custom functions
registered by users of less.php, include the original exception and
trace as previous exception.
Fixes https://github.com/wikimedia/less.php/issues/38.
Closes https://github.com/wikimedia/less.php/pull/39.
Co-authored-by: Timo Tijhof <krinklemail@fastmail.com> |
734,008 | 13.01.2023 00:08:51 | 0 | 859c943cbe0890225ccb77b32d6ddcbbd76b80fc | test: Add case for `Less_Parser::AllParsedFiles()` method | [
{
"change_type": "MODIFY",
"old_path": "test/phpunit/ParserTest.php",
"new_path": "test/phpunit/ParserTest.php",
"diff": "@@ -38,4 +38,25 @@ class phpunit_ParserTest extends phpunit_bootstrap {\n$parser->getVariables()\n);\n}\n+\n+ public function testAllParsedFiles() {\n+ $parser = new Less_Parser();\n+ $baseDir = realpath( $this->fixtures_dir . '/less.php/less' );\n+ $parser->parseFile( $baseDir . '/imports.less' );\n+ $parser->getCss();\n+\n+ $files = $parser->AllParsedFiles();\n+ $files = array_map( static function ( $file ) use ( $baseDir ) {\n+ return str_replace( $baseDir, '', $file );\n+ }, $files );\n+\n+ $this->assertEqualsCanonicalizing(\n+ [\n+ '/imports.less',\n+ '/imports/b.less',\n+ '/imports/a.less'\n+ ],\n+ $files\n+ );\n+ }\n}\n"
}
] | JavaScript | Apache License 2.0 | wikimedia/less.php | test: Add case for `Less_Parser::AllParsedFiles()` method |
734,008 | 13.01.2023 01:11:23 | 0 | fc5c42517e88df9cd8d0864d45ba0896c682e850 | doc: Split usage docs off to API.md | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "API.md",
"diff": "+Less.php API\n+========\n+\n+* [Basic use](#basic-use)\n+* [Caching](#caching)\n+* [Source maps](#source-maps)\n+* [Command line](#command-line)\n+\n+## Basic use\n+\n+#### Parse strings\n+\n+```php\n+$parser = new Less_Parser();\n+$parser->parse( '@color: #36c; .link { color: @color; } a { color: @color; }' );\n+$css = $parser->getCss();\n+```\n+\n+#### Parse files\n+\n+The `parseFile()` function takes two parameters:\n+\n+* The absolute path to a `.less` file.\n+* The base URL for any relative image or CSS references in the `.less` file,\n+ typically the same directory that contains the `.less` file or a public equivalent.\n+\n+```php\n+$parser = new Less_Parser();\n+$parser->parseFile( '/var/www/mysite/bootstrap.less', 'https://example.org/mysite/' );\n+$css = $parser->getCss();\n+```\n+\n+#### Handle invalid syntax\n+\n+An exception will be thrown if the compiler encounters invalid LESS.\n+\n+```php\n+try{\n+ $parser = new Less_Parser();\n+ $parser->parseFile( '/var/www/mysite/bootstrap.less', 'https://example.org/mysite/' );\n+ $css = $parser->getCss();\n+} catch (Exception $e) {\n+ echo $e->getMessage();\n+}\n+```\n+\n+#### Parse multiple inputs\n+\n+Less.php can parse multiple input sources (e.g. files and/or strings) and generate a single CSS output.\n+\n+```php\n+$parser = new Less_Parser();\n+$parser->parseFile( '/var/www/mysite/bootstrap.less', '/mysite/' );\n+$parser->parse( '@color: #36c; .link { color: @color; } a { color: @color; }' );\n+$css = $parser->getCss();\n+```\n+\n+#### Metadata\n+\n+Less.php keeps track of which `.less` files have been parsed, i.e. the input\n+file(s) and any direct and indirect imports.\n+\n+```php\n+$parser = new Less_Parser();\n+$parser->parseFile( '/var/www/mysite/bootstrap.less', '/mysite/' );\n+$css = $parser->getCss();\n+$files = $parser->AllParsedFiles();\n+```\n+\n+#### Compress output\n+\n+You can tell Less.php to remove comments and whitespace to generate minified CSS.\n+\n+```php\n+$options = [ 'compress' => true ];\n+$parser = new Less_Parser( $options );\n+$parser->parseFile( '/var/www/mysite/bootstrap.less', '/mysite/' );\n+$css = $parser->getCss();\n+```\n+\n+#### Get variables\n+\n+You can use the `getVariables()` method to get an all variables defined and\n+their value in an associative array. Note that the input must be compiled first\n+by calling `getCss()`.\n+\n+```php\n+$parser = new Less_Parser;\n+$parser->parseFile( '/var/www/mysite/bootstrap.less');\n+$css = $parser->getCss();\n+$variables = $parser->getVariables();\n+\n+```\n+\n+#### Set variables\n+\n+Use the `ModifyVars()` method to inject additional variables, i.e. custom values\n+computed or accessed from your PHP code.\n+\n+```php\n+$parser = new Less_Parser();\n+$parser->parseFile( '/var/www/mysite/bootstrap.less', '/mysite/' );\n+$parser->ModifyVars( [ 'font-size-base' => '16px' ] );\n+$css = $parser->getCss();\n+```\n+\n+#### Import directories\n+\n+By default, Less.php will look for imported files in the directory of the file passed to `parseFile()`.\n+\n+If you use `parse()`, or if need to enable additional import directories, you can specify these by\n+calling `SetImportDirs()`.\n+\n+```php\n+$directories = [ '/var/www/mysite/bootstrap/' => '/mysite/bootstrap/' ];\n+$parser = new Less_Parser();\n+$parser->SetImportDirs( $directories );\n+$parser->parseFile( '/var/www/mysite/theme.less', '/mysite/' );\n+$css = $parser->getCss();\n+```\n+\n+## Caching\n+\n+Compiling LESS code into CSS can be a time-consuming process. It is recommended to cache your results.\n+\n+#### Basic cache\n+\n+Use the `Less_Cache` class to save and reuse the results of compiling LESS files.\n+This class will check the modified time and size of each LESS file (including imported files) and\n+either re-use or re-generate the CSS output accordingly.\n+\n+The cache files are determinstically named, based on the full list of referenced LESS files and the metadata (file path, file mtime, file size) of each file. This means that each time a change is made, a different cache filename is used.\n+\n+```php\n+$lessFiles = [ '/var/www/mysite/bootstrap.less' => '/mysite/' ];\n+$options = [ 'cache_dir' => '/var/www/writable_folder' ];\n+$cssOutputFile = Less_Cache::Get( $lessFiles, $options );\n+$css = file_get_contents( '/var/www/writable_folder/' . $cssOutputFile );\n+```\n+\n+#### Caching with variables\n+\n+Passing custom variables to `Less_Cache::Get()`:\n+\n+```php\n+$lessFiles = [ '/var/www/mysite/bootstrap.less' => '/mysite/' ];\n+$options = [ 'cache_dir' => '/var/www/writable_folder' ];\n+$variables = [ 'width' => '100px' ];\n+$cssOutputFile = Less_Cache::Get( $lessFiles, $options, $variables );\n+$css = file_get_contents( '/var/www/writable_folder/' . $cssOutputFile );\n+```\n+\n+#### Incremental caching\n+\n+In addition to the whole-output caching described above, Less.php also has the ability to keep an internal cache which allows re-parses to be faster by effectively only re-compiling portions that have changed.\n+\n+## Source maps\n+\n+Less.php supports v3 sourcemaps.\n+\n+#### Inline\n+\n+The sourcemap will be appended to the generated CSS file.\n+\n+```php\n+$options = [ 'sourceMap' => true ];\n+$parser = new Less_Parser($options);\n+$parser->parseFile( '/var/www/mysite/bootstrap.less', '/mysite/' );\n+$css = $parser->getCss();\n+```\n+\n+#### Saving to map file\n+\n+```php\n+$options = [\n+ 'sourceMap' => true,\n+ 'sourceMapWriteTo' => '/var/www/mysite/writable_folder/filename.map',\n+ 'sourceMapURL' => '/mysite/writable_folder/filename.map',\n+];\n+$parser = new Less_Parser($options);\n+$parser->parseFile( '/var/www/mysite/bootstrap.less', '/mysite/' );\n+$css = $parser->getCss();\n+```\n+\n+## Command line\n+\n+An additional script has been included to use the Less.php compiler from the command line.\n+In its simplest invocation, you specify an input file and the compiled CSS is written to standard out:\n+\n+```\n+$ lessc input.less > output.css\n+```\n+\n+By using the `-w` flag you can watch a specified input file and have it compile as needed to the output file:\n+\n+```\n+$ lessc -w input.less output.css\n+```\n+\n+Errors from watch mode are written to standard out.\n+\n+For more information, run `lessc --help`\n"
}
] | JavaScript | Apache License 2.0 | wikimedia/less.php | doc: Split usage docs off to API.md |
734,008 | 13.01.2023 01:22:05 | 0 | d7bb3a813e895a0bf73f18441d45d602fc061a8a | doc: Add wp_enqueue_less to README as example integration
Closes | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -85,13 +85,11 @@ Note: The `setPreserveComments` option is ignored. Less.php already preserves CS\nLess.php can be used with [Drupal's less module](https://drupal.org/project/less) via the `lessc.inc.php` adapter. [Download Less.php](https://github.com/wikimedia/less.php/archive/main.zip) and unzip it so that `lessc.inc.php` is located at `sites/all/libraries/lessphp/lessc.inc.php`, then install the Drupal less module as usual.\n-#### WordPress JBST theme\n+#### WordPress\n-A copy of Less.php is built-in to the [JBST framework](https://github.com/bassjobsen/jamedo-bootstrap-start-theme).\n-\n-#### WordPress plugin\n-\n-The [Less PHP plugin for WordPress](https://wordpress.org/plugins/lessphp/) bundles a copy of Less.php for use in other plugins or themes. This dependency can also be combined with the [TGM Library](http://tgmpluginactivation.com/).\n+* [wp_enqueue_less](https://github.com/Ed-ITSolutions/wp_enqueue_less) is a Composer package for use in WordPress themes and plugins. It provides a `wp_enqueue_less()` function to automatically manage caching and compilation on-demand, and loads the compressed CSS on the page.\n+* [JBST framework](https://github.com/bassjobsen/jamedo-bootstrap-start-theme) bundles a copy of Less.php.\n+* The [lessphp plugin](https://wordpress.org/plugins/lessphp/) bundles a copy of Less.php for use in other plugins or themes. This dependency can also be combined with the [TGM Library](http://tgmpluginactivation.com/).\n## Credits\n"
}
] | JavaScript | Apache License 2.0 | wikimedia/less.php | doc: Add wp_enqueue_less to README as example integration
Closes https://github.com/wikimedia/less.php/pull/57.
Co-authored-by: Adam Laycock <adam@arcath.net> |
734,008 | 13.01.2023 02:12:54 | 0 | fa53e8146bd40fd7de191fa8b30fb865dfa169bb | build: Apply latest Wikimedia library boilerplate
Mostly from mediawiki/tools/cookiecutter-library. Some parts from
mediawiki/libs/Minify as being a fellow Apache-2.0 licensed project,
using the same LICENSE content (different whitespacing and restored
appendix), and similar NOTICE.txt format as required. | [
{
"change_type": "ADD",
"old_path": null,
"new_path": ".editorconfig",
"diff": "+# https://editorconfig.org\n+root = true\n+\n+[*]\n+indent_style = tab\n+indent_size = tab\n+trim_trailing_whitespace = true\n+insert_final_newline = true\n+\n+# Markdown:\n+# - Editors should not change leading spaces to tabs (e.g. multi-line list items)\n+# YAML:\n+# - Tabs cause problems <https://yaml.org/spec/1.2/spec.html#id2777534>\n+[*.{md,yml,yaml}]\n+indent_style = space\n+indent_size = 2\n"
},
{
"change_type": "MODIFY",
"old_path": ".gitattributes",
"new_path": ".gitattributes",
"diff": "/.* export-ignore\n/test/ export-ignore\n-/phpunit.xml export-ignore\n/test/**/*.map binary\n/test/**/*.min.js binary\n+/composer.json export-ignore\n+/Doxyfile export-ignore\n+/phpunit.xml.dist export-ignore\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/php.yml",
"new_path": ".github/workflows/php.yml",
"diff": "+# While the GitHub mirror is read-only, we keep this CI config\n+# for convenience to forks and pull requests.\n+#\n+# To submit a patch you can:\n+#\n+# * Create a Wikimedia Developer account and submit it to Wikimedia Gerrit\n+# <https://www.mediawiki.org/wiki/Developer_account>,\n+#\n+# * Or, submit the output of `git diff origin/HEAD`\n+# via <https://gerrit-patch-uploader.toolforge.org/>.\n+#\n+# * Or, create a pull request via GitHub and wait for someone\n+# else to do one of the above.\n+#\nname: Test\non:\n@@ -5,6 +19,21 @@ on:\n- pull_request\njobs:\n+\n+ # Lint-only for basic assurance until next major version\n+ php72:\n+ name: PHP 7.2\n+ # Includes php7.1 - 8.0 and composer 2\n+ # https://github.com/actions/runner-images/blob/ubuntu18/20210318.0/images/linux/Ubuntu1804-README.md#php\n+ runs-on: ubuntu-18.04\n+ steps:\n+ - uses: actions/checkout@v2\n+ - name: Use PHP 7.2\n+ run: sudo update-alternatives --set php /usr/bin/php7.2\n+ - run: rm composer.json\n+ - run: composer require --dev php-parallel-lint/php-parallel-lint=1.3.2\n+ - run: composer exec -- parallel-lint . --exclude external --exclude vendor\n+\nphp:\nname: PHP ${{ matrix.php }}\n@@ -12,12 +41,6 @@ jobs:\nfail-fast: false\nmatrix:\ninclude:\n- # Includes php7.1 - 8.0 and composer 2\n- # https://github.com/actions/runner-images/blob/ubuntu18/20210318.0/images/linux/Ubuntu1804-README.md#php\n- - php: '7.2'\n- os: ubuntu-18.04\n- - php: '7.3'\n- os: ubuntu-18.04\n# Includes php7.4 - 8.2 and composer 2\n# https://github.com/actions/runner-images/blob/ubuntu20/20221212.2/images/linux/Ubuntu2004-Readme.md#php\n- php: '7.4'\n@@ -46,54 +69,3 @@ jobs:\n- name: Test\nrun: composer test\n-\n- php-cover:\n- name: PHP ${{ matrix.php }} coverage\n-\n- strategy:\n- matrix:\n- include:\n- # PHPUnit 8.5 does not support code coverage on PHP 8\n- - php: '7.4'\n- os: ubuntu-20.04\n-\n- runs-on: ${{ matrix.os }}\n-\n- steps:\n- - name: Checkout\n- uses: actions/checkout@v2\n-\n- - name: Use PHP ${{ matrix.php }}\n- run: sudo update-alternatives --set php /usr/bin/php${{ matrix.php }}\n-\n- - name: Validate\n- run: composer validate\n-\n- - name: Install\n- run: composer install --prefer-dist --no-progress --no-suggest\n-\n- - name: Test with coverage\n- run: composer cover\n- env:\n- XDEBUG_MODE: coverage\n-\n- php-phan:\n- name: Phan\n-\n- runs-on: ubuntu-20.04\n-\n- steps:\n- - name: Checkout\n- uses: actions/checkout@v2\n-\n- - name: Use PHP 7.4\n- run: sudo update-alternatives --set php /usr/bin/php7.4\n-\n- - name: Validate\n- run: composer validate\n-\n- - name: Install\n- run: composer install --prefer-dist --no-progress --no-suggest\n-\n- - name: phan\n- run: composer phan\n"
},
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "# Build tools\n/coverage/\n+/doc/\n/vendor/\n/test/_cache/\n/test/phpunit/_cache/\n+/.idea\n/.phpunit.result.cache\n/composer.lock\n-\n-# Developer environment\n-.buildpath\n-.project\n-.settings\n-.idea\n-.DS_Store?\n-ehthumbs.db\n-Icon?\n-Thumbs.db\n-*.komodoproject\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": ".gitreview",
"diff": "+[gerrit]\n+host=gerrit.wikimedia.org\n+port=29418\n+project=mediawiki/libs/less.php.git\n+track=1\n"
},
{
"change_type": "MODIFY",
"old_path": ".phpcs.xml",
"new_path": ".phpcs.xml",
"diff": "-<?xml version=\"1.0\"?>\n+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<ruleset>\n- <file>.</file>\n- <arg name=\"extensions\" value=\"php\" />\n- <arg name=\"encoding\" value=\"UTF-8\" />\n- <exclude-pattern>vendor</exclude-pattern>\n<rule ref=\"./vendor/mediawiki/mediawiki-codesniffer/MediaWiki\">\n<exclude name=\"Generic.Arrays.DisallowLongArraySyntax.Found\" />\n<exclude name=\"Generic.CodeAnalysis.JumbledIncrementer.Found\" />\n<exclude name=\"Squiz.Strings.ConcatenationSpacing.PaddingFound\" />\n</rule>\n<rule ref=\"Generic.Classes.DuplicateClassName.Found\">\n- <!-- See .phan/stubs/Less_Tree_Selector.php -->\n+ <exclude-pattern>.phan/stubs/Less_Tree_Selector.php</exclude-pattern>\n<exclude-pattern>Less/Tree/Selector.php</exclude-pattern>\n</rule>\n+\n+ <file>.</file>\n+ <arg name=\"encoding\" value=\"UTF-8\"/>\n+ <arg name=\"extensions\" value=\"php\"/>\n+ <exclude-pattern>coverage</exclude-pattern>\n+ <exclude-pattern>doc/html</exclude-pattern>\n+ <exclude-pattern>vendor</exclude-pattern>\n</ruleset>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "CODE_OF_CONDUCT.md",
"diff": "+The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Special:MyLanguage/Code_of_Conduct).\n"
},
{
"change_type": "MODIFY",
"old_path": "LICENSE",
"new_path": "LICENSE",
"diff": "@@ -176,3 +176,27 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\nEND OF TERMS AND CONDITIONS\n+ APPENDIX: How to apply the Apache License to your work.\n+\n+ To apply the Apache License to your work, attach the following\n+ boilerplate notice, with the fields enclosed by brackets \"[]\"\n+ replaced with your own identifying information. (Don't include\n+ the brackets!) The text should be enclosed in the appropriate\n+ comment syntax for the file format. We also recommend that a\n+ file or class name and description of purpose be included on the\n+ same \"printed page\" as the copyright notice for easier\n+ identification within third-party archives.\n+\n+ Copyright [yyyy] [name of copyright owner]\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "[](https://packagist.org/packages/wikimedia/less.php)\n-[](https://github.com/wikimedia/less.php/actions)\nLess.php\n========\n@@ -37,7 +36,7 @@ If you have [Composer](https://getcomposer.org/download/) installed:\n#### Standalone\n-1. [Download a release](https://github.com/wikimedia/less.php/tags) and upload the PHP files to your server.\n+1. [Download Less.php](https://gerrit.wikimedia.org/g/mediawiki/libs/less.php/+archive/HEAD.tar.gz) and upload the PHP files to your server.\n2. Include the library:\n```php\nrequire_once '[path to]/less.php/lib/Less/Autoloader.php';\n@@ -77,13 +76,13 @@ If you're looking to transition from the [Leafo/lessphp](https://github.com/leaf\nThis allows Less.php to be a drop-in replacement for Leafo/lessphp.\n-[Download Less.php](https://github.com/wikimedia/less.php/archive/main.zip), unzip the files into your project, and include its `lessc.inc.php` instead.\n+[Download Less.php](https://gerrit.wikimedia.org/g/mediawiki/libs/less.php/+archive/HEAD.tar.gz), unzip the files into your project, and include its `lessc.inc.php` instead.\nNote: The `setPreserveComments` option is ignored. Less.php already preserves CSS block comments by default, and removes LESS inline comments.\n#### Drupal\n-Less.php can be used with [Drupal's less module](https://drupal.org/project/less) via the `lessc.inc.php` adapter. [Download Less.php](https://github.com/wikimedia/less.php/archive/main.zip) and unzip it so that `lessc.inc.php` is located at `sites/all/libraries/lessphp/lessc.inc.php`, then install the Drupal less module as usual.\n+Less.php can be used with [Drupal's less module](https://drupal.org/project/less) via the `lessc.inc.php` adapter. [Download Less.php](https://gerrit.wikimedia.org/g/mediawiki/libs/less.php/+archive/HEAD.tar.gz) and unzip it so that `lessc.inc.php` is located at `sites/all/libraries/lessphp/lessc.inc.php`, then install the Drupal less module as usual.\n#### WordPress\n"
},
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"description\": \"PHP port of the LESS processor\",\n\"keywords\": [ \"less\", \"css\", \"php\", \"stylesheet\", \"less.js\", \"lesscss\" ],\n\"license\": \"Apache-2.0\",\n+ \"homepage\": \"https://gerrit.wikimedia.org/g/mediawiki/libs/less.php\",\n\"authors\": [\n{\n\"name\": \"Timo Tijhof\",\n\"homepage\": \"https://github.com/Mordred\"\n}\n],\n+ \"autoload\": {\n+ \"psr-0\": { \"Less\": \"lib/\" },\n+ \"classmap\": [\"lessc.inc.php\"]\n+ },\n+ \"bin\": [\n+ \"bin/lessc\"\n+ ],\n\"require\": {\n\"php\": \">=7.2.9\"\n},\n\"require-dev\": {\n\"mediawiki/mediawiki-codesniffer\": \"39.0.0\",\n- \"mediawiki/mediawiki-phan-config\": \"0.11.1 || 0.12.0\",\n+ \"mediawiki/mediawiki-phan-config\": \"0.12.0\",\n\"mediawiki/minus-x\": \"1.1.1\",\n\"php-parallel-lint/php-console-highlighter\": \"1.0.0\",\n\"php-parallel-lint/php-parallel-lint\": \"1.3.2\",\n\"parallel-lint . --exclude vendor\",\n\"phpunit\",\n\"phpcs -sp\",\n+ \"@phan\",\n\"minus-x check .\"\n],\n- \"cover\": \"phpunit --coverage-text --coverage-html coverage/ --coverage-clover coverage/clover.xml\",\n+ \"cover\": \"phpunit --coverage-html coverage\",\n\"fix\": [\n- \"minus-x fix .\",\n- \"phpcbf\"\n+ \"phpcbf\",\n+ \"minus-x fix .\"\n],\n- \"phan\": \"phan --allow-polyfill-parser --no-progress-bar\"\n- },\n- \"autoload\": {\n- \"psr-0\": { \"Less\": \"lib/\" },\n- \"classmap\": [\"lessc.inc.php\"]\n- },\n- \"bin\": [\n- \"bin/lessc\"\n- ]\n+ \"phan\": \"phan --allow-polyfill-parser\"\n+ }\n}\n"
},
{
"change_type": "RENAME",
"old_path": "phpunit.xml",
"new_path": "phpunit.xml.dist",
"diff": "bootstrap=\"test/phpunit/bootstrap.php\"\n>\n<testsuites>\n- <testsuite name=\"Test Suite\">\n+ <testsuite name=\"Tests\">\n<directory>./test/phpunit</directory>\n</testsuite>\n</testsuites>\n"
}
] | JavaScript | Apache License 2.0 | wikimedia/less.php | build: Apply latest Wikimedia library boilerplate
Mostly from mediawiki/tools/cookiecutter-library. Some parts from
mediawiki/libs/Minify as being a fellow Apache-2.0 licensed project,
using the same LICENSE content (different whitespacing and restored
appendix), and similar NOTICE.txt format as required.
Change-Id: Ic0c6b2afdba971562c60da1a87d8e7a72ab4a365 |
734,008 | 22.01.2023 07:02:24 | 0 | 0d5b30ba792bdbf8991a646fc9c30561b38a5559 | Tag v3.2.1 | [
{
"change_type": "MODIFY",
"old_path": "CHANGES.md",
"new_path": "CHANGES.md",
"diff": "# Changelog\n+## 3.2.1\n+\n+* [All changes](https://gerrit.wikimedia.org/g/mediawiki/libs/less.php/+log/v3.2.1)\n+* Tree_Ruleset: Fix support for nested parent selectors (Timo Tijhof) [T204816](https://phabricator.wikimedia.org/T204816)\n+* Fix ParseError when interpolating variable after colon in selector (Timo Tijhof) [T327163](https://phabricator.wikimedia.org/T327163)\n+* Functions: Fix \"Undefined property\" warning on bad minmax arg\n+* Tree_Call: Include previous exception when catching functions (Robert Frunzke)\n+\n## 3.2.0\n* [All changes](https://github.com/wikimedia/less.php/compare/v3.1.0...v3.2.0)\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/Less/Version.php",
"new_path": "lib/Less/Version.php",
"diff": "*/\nclass Less_Version {\n- public const version = '3.2.0'; // The current build number of less.php\n+ public const version = '3.2.1'; // The current build number of less.php\npublic const less_version = '2.5.3'; // The less.js version that this build should be compatible with\npublic const cache_version = '253'; // The parser cache version\n"
}
] | JavaScript | Apache License 2.0 | wikimedia/less.php | Tag v3.2.1
Change-Id: I968598b2b5e801ff302bb2fec3f53e54e94cba84 |
734,008 | 22.01.2023 07:03:03 | 0 | d81f187568afa3d1c0095f82c346059fa879b30f | build: Require PHP 7.4.3+
Drop support for PHP 7.2 and 7.3. | [
{
"change_type": "MODIFY",
"old_path": ".github/workflows/php.yml",
"new_path": ".github/workflows/php.yml",
"diff": "@@ -20,20 +20,6 @@ on:\njobs:\n- # Lint-only for basic assurance until next major version\n- php72:\n- name: PHP 7.2\n- # Includes php7.1 - 8.0 and composer 2\n- # https://github.com/actions/runner-images/blob/ubuntu18/20210318.0/images/linux/Ubuntu1804-README.md#php\n- runs-on: ubuntu-18.04\n- steps:\n- - uses: actions/checkout@v2\n- - name: Use PHP 7.2\n- run: sudo update-alternatives --set php /usr/bin/php7.2\n- - run: rm composer.json\n- - run: composer require --dev php-parallel-lint/php-parallel-lint=1.3.2\n- - run: composer exec -- parallel-lint . --exclude external --exclude vendor\n-\nphp:\nname: PHP ${{ matrix.php }}\n"
},
{
"change_type": "MODIFY",
"old_path": ".phan/config.php",
"new_path": ".phan/config.php",
"diff": "<?php\nreturn [\n- 'target_php_version' => '7.2',\n+ 'target_php_version' => '7.4',\n// A list of directories that should be parsed for class and\n// method information. After excluding the directories\n"
},
{
"change_type": "MODIFY",
"old_path": "composer.json",
"new_path": "composer.json",
"diff": "\"bin/lessc\"\n],\n\"require\": {\n- \"php\": \">=7.2.9\"\n+ \"php\": \">=7.4.3\"\n},\n\"require-dev\": {\n\"mediawiki/mediawiki-codesniffer\": \"40.0.1\",\n"
}
] | JavaScript | Apache License 2.0 | wikimedia/less.php | build: Require PHP 7.4.3+
Drop support for PHP 7.2 and 7.3.
Change-Id: Ie31d40c081fe42e30c6f4f52d5dbb955c9b7a2d2 |
734,008 | 22.01.2023 07:33:59 | 0 | 2370bbea0d36f12e3498d56a9c412f2317b15127 | Less_Parser: Remove 'NewObj' indirection for old cache methods
Follows-up which removed the cache methods that needed
the `Less_Tree->cache_string` and thus removes the need for the
'NewObj' indirection'. | [
{
"change_type": "MODIFY",
"old_path": "lib/Less/Parser.php",
"new_path": "lib/Less/Parser.php",
"diff": "@@ -966,13 +966,13 @@ $g = intval( $g );\nif ( $this->input[$this->pos + 1] === '/' ) {\n$match = $this->MatchReg( '/\\\\G\\/\\/.*/' );\n- return $this->NewObj( 'Less_Tree_Comment', [ $match[0], true, $this->pos, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Comment( $match[0], true, $this->pos, $this->env->currentFileInfo );\n}\n// $comment = $this->MatchReg('/\\\\G\\/\\*(?:[^*]|\\*+[^\\/*])*\\*+\\/\\n?/');\n$comment = $this->MatchReg( '/\\\\G\\/\\*(?s).*?\\*+\\/\\n?/' );// not the same as less.js to prevent fatal errors\nif ( $comment ) {\n- return $this->NewObj( 'Less_Tree_Comment', [ $comment[0], false, $this->pos, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Comment( $comment[0], false, $this->pos, $this->env->currentFileInfo );\n}\n}\n@@ -1023,7 +1023,7 @@ $g = intval( $g );\n}\n$quoted = $char . $matched . $char;\n- return $this->NewObj( 'Less_Tree_Quoted', [ $quoted, $matched, $e, $index, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Quoted( $quoted, $matched, $e, $index, $this->env->currentFileInfo );\n}\n/**\n@@ -1078,7 +1078,7 @@ $g = intval( $g );\nif ( $color ) {\nreturn $color;\n}\n- return $this->NewObj( 'Less_Tree_Keyword', [ $k ] );\n+ return new Less_Tree_Keyword( $k );\n}\n}\n@@ -1088,11 +1088,11 @@ $g = intval( $g );\nif ( Less_Colors::hasOwnProperty( $keyword ) ) {\n// detect named color\n- return $this->NewObj( 'Less_Tree_Color', [ substr( Less_Colors::color( $keyword ), 1 ) ] );\n+ return new Less_Tree_Color( substr( Less_Colors::color( $keyword ), 1 ) );\n}\nif ( $keyword === 'transparent' ) {\n- return $this->NewObj( 'Less_Tree_Color', [ [ 0, 0, 0 ], 0, true ] );\n+ return new Less_Tree_Color( [ 0, 0, 0 ], 0, true );\n}\n}\n@@ -1137,7 +1137,7 @@ $g = intval( $g );\n}\nif ( $name ) {\n- return $this->NewObj( 'Less_Tree_Call', [ $name, $args, $index, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Call( $name, $args, $index, $this->env->currentFileInfo );\n}\n}\n@@ -1188,7 +1188,7 @@ $g = intval( $g );\n$value = $this->parseEntity();\nif ( $value ) {\n- return $this->NewObj( 'Less_Tree_Assignment', [ $key[0], $value ] );\n+ return new Less_Tree_Assignment( $key[0], $value );\n}\n}\n@@ -1213,10 +1213,10 @@ $g = intval( $g );\n// @phan-suppress-next-line PhanUndeclaredProperty\nif ( isset( $value->value ) || $value instanceof Less_Tree_Variable ) {\n- return $this->NewObj( 'Less_Tree_Url', [ $value, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Url( $value, $this->env->currentFileInfo );\n}\n- return $this->NewObj( 'Less_Tree_Url', [ $this->NewObj( 'Less_Tree_Anonymous', [ $value ] ), $this->env->currentFileInfo ] );\n+ return new Less_Tree_Url( new Less_Tree_Anonymous( $value ), $this->env->currentFileInfo );\n}\n/**\n@@ -1232,7 +1232,7 @@ $g = intval( $g );\nprivate function parseEntitiesVariable() {\n$index = $this->pos;\nif ( $this->PeekChar( '@' ) && ( $name = $this->MatchReg( '/\\\\G@@?[\\w-]+/' ) ) ) {\n- return $this->NewObj( 'Less_Tree_Variable', [ $name[0], $index, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Variable( $name[0], $index, $this->env->currentFileInfo );\n}\n}\n@@ -1245,7 +1245,7 @@ $g = intval( $g );\n$index = $this->pos;\nif ( $this->input_len > ( $this->pos + 1 ) && $this->input[$this->pos] === '@' && ( $curly = $this->MatchReg( '/\\\\G@\\{([\\w-]+)\\}/' ) ) ) {\n- return $this->NewObj( 'Less_Tree_Variable', [ '@' . $curly[1], $index, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Variable( '@' . $curly[1], $index, $this->env->currentFileInfo );\n}\n}\n@@ -1260,7 +1260,7 @@ $g = intval( $g );\n*/\nprivate function parseEntitiesColor() {\nif ( $this->PeekChar( '#' ) && ( $rgb = $this->MatchReg( '/\\\\G#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/' ) ) ) {\n- return $this->NewObj( 'Less_Tree_Color', [ $rgb[1] ] );\n+ return new Less_Tree_Color( $rgb[1] );\n}\n}\n@@ -1282,9 +1282,9 @@ $g = intval( $g );\n$value = $this->MatchReg( '/\\\\G([+-]?\\d*\\.?\\d+)(%|[a-z]+)?/' );\nif ( $value ) {\nif ( isset( $value[2] ) ) {\n- return $this->NewObj( 'Less_Tree_Dimension', [ $value[1],$value[2] ] );\n+ return new Less_Tree_Dimension( $value[1], $value[2] );\n}\n- return $this->NewObj( 'Less_Tree_Dimension', [ $value[1] ] );\n+ return new Less_Tree_Dimension( $value[1] );\n}\n}\n@@ -1298,7 +1298,7 @@ $g = intval( $g );\nfunction parseUnicodeDescriptor() {\n$ud = $this->MatchReg( '/\\\\G(U\\+[0-9a-fA-F?]+)(\\-[0-9a-fA-F?]+)?/' );\nif ( $ud ) {\n- return $this->NewObj( 'Less_Tree_UnicodeDescriptor', [ $ud[0] ] );\n+ return new Less_Tree_UnicodeDescriptor( $ud[0] );\n}\n}\n@@ -1322,7 +1322,7 @@ $g = intval( $g );\n}\n$str = $this->MatchReg( '/\\\\G`([^`]*)`/' );\nif ( $str ) {\n- return $this->NewObj( 'Less_Tree_Javascript', [ $str[1], $this->pos, $e ] );\n+ return new Less_Tree_Javascript( $str[1], $this->pos, $e );\n}\n}\n@@ -1344,7 +1344,7 @@ $g = intval( $g );\n//\nprivate function parseRulesetCall() {\nif ( $this->input[$this->pos] === '@' && ( $name = $this->MatchReg( '/\\\\G(@[\\w-]+)\\s*\\(\\s*\\)\\s*;/' ) ) ) {\n- return $this->NewObj( 'Less_Tree_RulesetCall', [ $name[1] ] );\n+ return new Less_Tree_RulesetCall( $name[1] );\n}\n}\n@@ -1377,7 +1377,7 @@ $g = intval( $g );\n$option = $option[1];\n}\n- $extendList[] = $this->NewObj( 'Less_Tree_Extend', [ $this->NewObj( 'Less_Tree_Selector', [ $elements ] ), $option, $index ] );\n+ $extendList[] = new Less_Tree_Extend( new Less_Tree_Selector( $elements ), $option, $index );\n} while ( $this->MatchChar( \",\" ) );\n@@ -1426,7 +1426,7 @@ $g = intval( $g );\nif ( $this->parseEnd() ) {\n$this->forget();\n- return $this->NewObj( 'Less_Tree_Mixin_Call', [ $elements, $args, $index, $this->env->currentFileInfo, $important ] );\n+ return new Less_Tree_Mixin_Call( $elements, $args, $index, $this->env->currentFileInfo, $important );\n}\n}\n@@ -1443,7 +1443,7 @@ $g = intval( $g );\nif ( !$e ) {\nbreak;\n}\n- $elements[] = $this->NewObj( 'Less_Tree_Element', [ $c, $e[0], $elemIndex, $this->env->currentFileInfo ] );\n+ $elements[] = new Less_Tree_Element( $c, $e[0], $elemIndex, $this->env->currentFileInfo );\n$c = $this->MatchChar( '>' );\n}\n@@ -1574,7 +1574,7 @@ $g = intval( $g );\n$isSemiColonSeperated = true;\nif ( count( $expressions ) > 1 ) {\n- $value = $this->NewObj( 'Less_Tree_Value', [ $expressions ] );\n+ $value = new Less_Tree_Value( $expressions );\n}\n$argsSemiColon[] = [ 'name' => $name, 'value' => $value ];\n@@ -1647,7 +1647,7 @@ $g = intval( $g );\nif ( $ruleset !== null ) {\n$this->forget();\n- return $this->NewObj( 'Less_Tree_Mixin_Definition', [ $name, $params, $ruleset, $cond, $variadic ] );\n+ return new Less_Tree_Mixin_Definition( $name, $params, $ruleset, $cond, $variadic );\n}\n$this->restore();\n@@ -1694,7 +1694,7 @@ $g = intval( $g );\n}\n$this->expectChar( ')' );\n- return $this->NewObj( 'Less_Tree_Alpha', [ $value ] );\n+ return new Less_Tree_Alpha( $value );\n}\n/**\n@@ -1732,7 +1732,7 @@ $g = intval( $g );\n$this->save();\nif ( $this->MatchChar( '(' ) ) {\nif ( ( $v = $this->parseSelector() ) && $this->MatchChar( ')' ) ) {\n- $e = $this->NewObj( 'Less_Tree_Paren', [ $v ] );\n+ $e = new Less_Tree_Paren( $v );\n$this->forget();\n} else {\n$this->restore();\n@@ -1743,7 +1743,7 @@ $g = intval( $g );\n}\nif ( $e !== null ) {\n- return $this->NewObj( 'Less_Tree_Element', [ $c, $e, $index, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Element( $c, $e, $index, $this->env->currentFileInfo );\n}\n}\n@@ -1835,7 +1835,7 @@ $g = intval( $g );\n}\nif ( $elements ) {\n- return $this->NewObj( 'Less_Tree_Selector', [ $elements, $extendList, $condition, $index, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Selector( $elements, $extendList, $condition, $index, $this->env->currentFileInfo );\n}\nif ( $extendList ) {\n$this->Error( 'Extend must be used to extend a selector, it cannot be used on its own' );\n@@ -1865,7 +1865,7 @@ $g = intval( $g );\n$this->expectChar( ']' );\n- return $this->NewObj( 'Less_Tree_Attribute', [ $key, $op === null ? null : $op[0], $val ] );\n+ return new Less_Tree_Attribute( $key, $op === null ? null : $op[0], $val );\n}\n/**\n@@ -1888,7 +1888,7 @@ $g = intval( $g );\n$block = $this->parseBlock();\nif ( $block ) {\n- $block = $this->NewObj( 'Less_Tree_Ruleset', [ null, $block ] );\n+ $block = new Less_Tree_Ruleset( null, $block );\n}\nreturn $block;\n@@ -1898,7 +1898,7 @@ $g = intval( $g );\nprivate function parseDetachedRuleset() {\n$blockRuleset = $this->parseBlockRuleset();\nif ( $blockRuleset ) {\n- return $this->NewObj( 'Less_Tree_DetachedRuleset', [ $blockRuleset ] );\n+ return new Less_Tree_DetachedRuleset( $blockRuleset );\n}\n}\n@@ -1943,7 +1943,7 @@ $g = intval( $g );\n$this->forget();\n// TODO: Less_Environment::$strictImports is not yet ported\n// It is passed here by less.js\n- return $this->NewObj( 'Less_Tree_Ruleset', [ $selectors, $rules ] );\n+ return new Less_Tree_Ruleset( $selectors, $rules );\n}\n}\n@@ -1970,7 +1970,7 @@ $g = intval( $g );\n$match[2] .= ' !important';\n}\n- return $this->NewObj( 'Less_Tree_NameValue', [ $match[1], $match[2], $index, $this->env->currentFileInfo ] );\n+ return new Less_Tree_NameValue( $match[1], $match[2], $index, $this->env->currentFileInfo );\n}\n$this->restore();\n@@ -2018,7 +2018,7 @@ $g = intval( $g );\nif ( $value ) {\n$this->forget();\n// anonymous values absorb the end ';' which is required for them to work\n- return $this->NewObj( 'Less_Tree_Rule', [ $name, $value, false, $merge, $startOfRule, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Rule( $name, $value, false, $merge, $startOfRule, $this->env->currentFileInfo );\n}\n}\nif ( !$tryValueFirst && !$value ) {\n@@ -2030,7 +2030,7 @@ $g = intval( $g );\nif ( $value && $this->parseEnd() ) {\n$this->forget();\n- return $this->NewObj( 'Less_Tree_Rule', [ $name, $value, $important, $merge, $startOfRule, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Rule( $name, $value, $important, $merge, $startOfRule, $this->env->currentFileInfo );\n} else {\n$this->restore();\nif ( $value && !$tryAnonymous ) {\n@@ -2045,7 +2045,7 @@ $g = intval( $g );\nfunction parseAnonymousValue() {\n$match = $this->MatchReg( '/\\\\G([^@+\\/\\'\"*`(;{}-]*);/' );\nif ( $match ) {\n- return $this->NewObj( 'Less_Tree_Anonymous', [ $match[1] ] );\n+ return new Less_Tree_Anonymous( $match[1] );\n}\n}\n@@ -2072,11 +2072,11 @@ $g = intval( $g );\n$features = $this->parseMediaFeatures();\nif ( $this->MatchChar( ';' ) ) {\nif ( $features ) {\n- $features = $this->NewObj( 'Less_Tree_Value', [ $features ] );\n+ $features = new Less_Tree_Value( $features );\n}\n$this->forget();\n- return $this->NewObj( 'Less_Tree_Import', [ $path, $features, $options, $this->pos, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Import( $path, $features, $options, $this->pos, $this->env->currentFileInfo );\n}\n}\n}\n@@ -2133,10 +2133,10 @@ $g = intval( $g );\n$e = $this->parseValue();\nif ( $this->MatchChar( ')' ) ) {\nif ( $p && $e ) {\n- $r = $this->NewObj( 'Less_Tree_Rule', [ $p, $e, null, null, $this->pos, $this->env->currentFileInfo, true ] );\n- $nodes[] = $this->NewObj( 'Less_Tree_Paren', [ $r ] );\n+ $r = new Less_Tree_Rule( $p, $e, null, null, $this->pos, $this->env->currentFileInfo, true );\n+ $nodes[] = new Less_Tree_Paren( $r );\n} elseif ( $e ) {\n- $nodes[] = $this->NewObj( 'Less_Tree_Paren', [ $e ] );\n+ $nodes[] = new Less_Tree_Paren( $e );\n} else {\nreturn null;\n}\n@@ -2147,7 +2147,7 @@ $g = intval( $g );\n} while ( $e );\nif ( $nodes ) {\n- return $this->NewObj( 'Less_Tree_Expression', [ $nodes ] );\n+ return new Less_Tree_Expression( $nodes );\n}\n}\n@@ -2188,7 +2188,7 @@ $g = intval( $g );\n}\n$this->forget();\n- return $this->NewObj( 'Less_Tree_Media', [ $rules, $features, $this->pos, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Media( $rules, $features, $this->pos, $this->env->currentFileInfo );\n}\n}\n@@ -2288,7 +2288,7 @@ $g = intval( $g );\n$value = $this->MatchReg( '/\\\\G[^{;]+/' );\nif ( $value ) {\n- $value = $this->NewObj( 'Less_Tree_Anonymous', [ trim( $value[0] ) ] );\n+ $value = new Less_Tree_Anonymous( trim( $value[0] ) );\n}\n}\n@@ -2298,7 +2298,7 @@ $g = intval( $g );\nif ( $rules || ( !$hasBlock && $value && $this->MatchChar( ';' ) ) ) {\n$this->forget();\n- return $this->NewObj( 'Less_Tree_Directive', [ $name, $value, $rules, $index, $this->env->currentFileInfo ] );\n+ return new Less_Tree_Directive( $name, $value, $rules, $index, $this->env->currentFileInfo );\n}\n$this->restore();\n@@ -2326,7 +2326,7 @@ $g = intval( $g );\n} while ( $e );\nif ( $expressions ) {\n- return $this->NewObj( 'Less_Tree_Value', [ $expressions ] );\n+ return new Less_Tree_Value( $expressions );\n}\n}\n@@ -2341,7 +2341,7 @@ $g = intval( $g );\n$a = $this->parseAddition();\nif ( $a ) {\n$this->expectChar( ')' );\n- return $this->NewObj( 'Less_Tree_Expression', [ [ $a ], true ] ); // instead of $e->parens = true so the value is cached\n+ return new Less_Tree_Expression( [ $a ], true ); // instead of $e->parens = true so the value is cached\n}\n}\n}\n@@ -2377,7 +2377,7 @@ $g = intval( $g );\n$m->parensInOp = true;\n$a->parensInOp = true;\n- $return = $this->NewObj( 'Less_Tree_Operation', [ $op, [ $return, $a ], $isSpaced ] );\n+ $return = new Less_Tree_Operation( $op, [ $return, $a ], $isSpaced );\n}\n}\nreturn $return;\n@@ -2414,7 +2414,7 @@ $g = intval( $g );\n$m->parensInOp = true;\n$a->parensInOp = true;\n- $return = $this->NewObj( 'Less_Tree_Operation', [ $op, [ $return, $a ], $isSpaced ] );\n+ $return = new Less_Tree_Operation( $op, [ $return, $a ], $isSpaced );\n}\n}\n@@ -2439,7 +2439,7 @@ $g = intval( $g );\nbreak;\n}\n- $return = $this->NewObj( 'Less_Tree_Condition', [ 'or', $return, $b, $index ] );\n+ $return = new Less_Tree_Condition( 'or', $return, $b, $index );\n}\nreturn $return;\n}\n@@ -2461,17 +2461,17 @@ $g = intval( $g );\nif ( $op ) {\n$b = $this->MatchFuncs( [ 'parseAddition','parseEntitiesKeyword','parseEntitiesQuoted' ] );\nif ( $b ) {\n- $c = $this->NewObj( 'Less_Tree_Condition', [ $op[0], $a, $b, $index, $negate ] );\n+ $c = new Less_Tree_Condition( $op[0], $a, $b, $index, $negate );\n} else {\n$this->Error( 'Unexpected expression' );\n}\n} else {\n- $k = $this->NewObj( 'Less_Tree_Keyword', [ 'true' ] );\n- $c = $this->NewObj( 'Less_Tree_Condition', [ '=', $a, $k, $index, $negate ] );\n+ $k = new Less_Tree_Keyword( 'true' );\n+ $c = new Less_Tree_Condition( '=', $a, $k, $index, $negate );\n}\n$this->expectChar( ')' );\n// @phan-suppress-next-line PhanPossiblyInfiniteRecursionSameParams\n- return $this->MatchReg( '/\\\\Gand/' ) ? $this->NewObj( 'Less_Tree_Condition', [ 'and', $c, $this->parseCondition() ] ) : $c;\n+ return $this->MatchReg( '/\\\\Gand/' ) ? new Less_Tree_Condition( 'and', $c, $this->parseCondition() ) : $c;\n}\n}\n@@ -2494,7 +2494,7 @@ $g = intval( $g );\nif ( $negate ) {\n$o->parensInOp = true;\n- $o = $this->NewObj( 'Less_Tree_Negative', [ $o ] );\n+ $o = new Less_Tree_Negative( $o );\n}\nreturn $o;\n@@ -2517,14 +2517,14 @@ $g = intval( $g );\nif ( !$this->PeekReg( '/\\\\G\\/[\\/*]/' ) ) {\n$delim = $this->MatchChar( '/' );\nif ( $delim ) {\n- $entities[] = $this->NewObj( 'Less_Tree_Anonymous', [ $delim ] );\n+ $entities[] = new Less_Tree_Anonymous( $delim );\n}\n}\n}\n} while ( $e );\nif ( $entities ) {\n- return $this->NewObj( 'Less_Tree_Expression', [ $entities ] );\n+ return new Less_Tree_Expression( $entities );\n}\n}\n@@ -2555,7 +2555,7 @@ $g = intval( $g );\n$simpleProperty = $this->MatchReg( '/\\\\G([_a-zA-Z0-9-]+)\\s*:/' );\nif ( $simpleProperty ) {\n- $name[] = $this->NewObj( 'Less_Tree_Keyword', [ $simpleProperty[1] ] );\n+ $name[] = new Less_Tree_Keyword( $simpleProperty[1] );\n$this->forget();\nreturn $name;\n}\n@@ -2577,9 +2577,9 @@ $g = intval( $g );\n}\nforeach ( $name as $k => $s ) {\nif ( !$s || $s[0] !== '@' ) {\n- $name[$k] = $this->NewObj( 'Less_Tree_Keyword', [ $s ] );\n+ $name[$k] = new Less_Tree_Keyword( $s );\n} else {\n- $name[$k] = $this->NewObj( 'Less_Tree_Variable', [ '@' . substr( $s, 2, -1 ), $index[$k], $this->env->currentFileInfo ] );\n+ $name[$k] = new Less_Tree_Variable( '@' . substr( $s, 2, -1 ), $index[$k], $this->env->currentFileInfo );\n}\n}\nreturn $name;\n@@ -2635,57 +2635,6 @@ $g = intval( $g );\n}\n}\n- /**\n- * Create a new instance of $class with args $args, and optionally generates a cache string.\n- * $class should be a Less_Tree_* class.\n- *\n- * @phan-template TClassName\n- * @phan-param class-string<TClassName> $class\n- * @phan-param array<int,mixed> $args\n- * @phan-return TClassName\n- *\n- * @param string $class\n- * @param mixed[] $args\n- * @return Less_Tree Instance of $class subclass created with $args\n- */\n- public function NewObj( $class, $args = [] ) {\n- $obj = new $class( ...$args );\n- if ( $this->CacheEnabled() ) {\n- $argStrings = array_map(\n- [ __CLASS__, 'ArgString' ],\n- $args\n- );\n- $argCache = implode( ',', $argStrings );\n- // @phan-suppress-next-line PhanTypeExpectedObjectPropAccess False positive\n- $obj->cache_string = \" new $class($argCache)\";\n- }\n- return $obj;\n- }\n-\n- /**\n- * Convert an argument to a string for use in the parser cache\n- *\n- * @return string\n- */\n- public static function ArgString( $arg ) {\n- $type = gettype( $arg );\n-\n- if ( $type === 'object' ) {\n- $string = $arg->cache_string;\n- unset( $arg->cache_string );\n- return $string;\n-\n- } elseif ( $type === 'array' ) {\n- $string = ' Array(';\n- foreach ( $arg as $k => $a ) {\n- $string .= var_export( $k, true ) . ' => ' . self::ArgString( $a ) . ',';\n- }\n- return $string . ')';\n- }\n-\n- return var_export( $arg, true );\n- }\n-\n/** @return never */\npublic function Error( $msg ) {\nthrow new Less_Exception_Parser( $msg, null, $this->furthest, $this->env->currentFileInfo );\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/Less/Tree.php",
"new_path": "lib/Less/Tree.php",
"diff": "*/\nclass Less_Tree {\n- public $cache_string;\npublic $parensInOp = false;\npublic $extendOnEveryPath;\npublic $allExtends;\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/Less/Tree/Rule.php",
"new_path": "lib/Less/Tree/Rule.php",
"diff": "@@ -7,6 +7,7 @@ class Less_Tree_Rule extends Less_Tree {\npublic $name;\n/** @var Less_Tree $value */\npublic $value;\n+ /** @var string $important */\npublic $important;\npublic $merge;\npublic $index;\n@@ -16,7 +17,13 @@ class Less_Tree_Rule extends Less_Tree {\npublic $type = 'Rule';\n/**\n- * @param string $important\n+ * @param string|array<Less_Tree_Keyword|Less_Tree_Variable> $name\n+ * @param mixed $value\n+ * @param null|false|string $important\n+ * @param null|false|string $merge\n+ * @param int|null $index\n+ * @param array|null $currentFileInfo\n+ * @param bool $inline\n*/\npublic function __construct( $name, $value = null, $important = null, $merge = null, $index = null, $currentFileInfo = null, $inline = false ) {\n$this->name = $name;\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/Less/Visitor/processExtends.php",
"new_path": "lib/Less/Visitor/processExtends.php",
"diff": "@@ -359,7 +359,9 @@ class Less_Visitor_processExtends extends Less_Visitor {\nreturn true;\n}\n+ // @phan-suppress-next-line PhanUndeclaredProperty https://phabricator.wikimedia.org/T327082\n$elementValue1 = ( $elementValue1->value->value ?: $elementValue1->value );\n+ // @phan-suppress-next-line PhanUndeclaredProperty https://phabricator.wikimedia.org/T327082\n$elementValue2 = ( $elementValue2->value->value ?: $elementValue2->value );\nreturn $elementValue1 === $elementValue2;\n"
},
{
"change_type": "MODIFY",
"old_path": "test/index.php",
"new_path": "test/index.php",
"diff": "@@ -587,7 +587,7 @@ function obj( $mixed, $objects = [] ) {\nstatic $level = 0;\n$output = '';\n- $exclude_keys = [ 'originalRuleset','currentFileInfo','lookups','index','ruleset_id','type','_rulesets','_variables','allowImports','_css','cache_string','elements_len',\n+ $exclude_keys = [ 'originalRuleset','currentFileInfo','lookups','index','ruleset_id','type','_rulesets','_variables','allowImports','_css','elements_len',\n'_oelements','_oelements_assoc','first_oelements','_oelements_len','cacheable', ]; // 'variable','combinator'\n//$exclude_keys = array();\n"
}
] | JavaScript | Apache License 2.0 | wikimedia/less.php | Less_Parser: Remove 'NewObj' indirection for old cache methods
Follows-up If6745bdc37e2c, which removed the cache methods that needed
the `Less_Tree->cache_string` and thus removes the need for the
'NewObj' indirection'.
Change-Id: Ief46e254806e2035bb0350f8142022dc32454102 |
718,838 | 29.09.2019 17:08:05 | -10,800 | 3300129bee26099dc4093fbdb6c1b18a82c72f51 | v0.1 Installation and Deployment fixes
+ README Update
+ setup for pypl deletion
+ travis support deletion | [
{
"change_type": "DELETE",
"old_path": ".travis.yml",
"new_path": null,
"diff": "-language: python\n-python:\n- - \"3.6\"\n-script: \"echo .\"\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "### Install\n-From GitHub:\n+From GitHub with git:\n```sh\n-pip install https://github.com/timoniq/vkbottle/archive/master.zip --upgrade\n-```\n-\n-From PyPI (old release):\n-\n-```sh\n-pip install vkbottle\n+git clone git://github.com/timoniq/vkbottler.git vkbottle\n```\n### Features\n@@ -26,6 +20,14 @@ pip install vkbottle\n- Full VK Event Compatible\n- Full Asyncio Support\n+### Deployment import\n+\n+After installation into your project use relative import to use vkbottle:\n+\n+```python\n+from .vkbottle.vkbottle import Bot, Message\n+```\n+\n### Usage\n```python\n"
},
{
"change_type": "DELETE",
"old_path": "setup.cfg",
"new_path": null,
"diff": "-[metadata]\n-description-file = README.md\n-license_files = LICENSE.txt\n\\ No newline at end of file\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 Installation and Deployment fixes
+ README Update
+ setup for pypl deletion
+ travis support deletion |
718,838 | 30.09.2019 20:24:43 | -10,800 | c9a4e2d2776cf15421892e91424f4d2e99566b42 | v0.1 Added python highlighting to code samples | [
{
"change_type": "MODIFY",
"old_path": "COMMERCIAL.md",
"new_path": "COMMERCIAL.md",
"diff": "@@ -10,7 +10,7 @@ Welcome to VKBottle! VKBottle is a useful client with useful facilities for work\n* :man_technologist:Full Can-Be-Sended objects for advanced usage\n- ```\n+ ```python\n@bot.on.message.lower('plastify <material:usage>', validators=(validators.SafeMessage)}:\nasync def handler(ans: Message, material):\npoll = Poll('Material {} is cool?'.format(material)).add(('yes', 'noh'))\n@@ -21,7 +21,7 @@ Welcome to VKBottle! VKBottle is a useful client with useful facilities for work\n* For arguments\n- ```\n+ ```python\nclass CustomValidators(RegexValidators):\nasync def some_user(self, text):\nmatched = re.match(r'\\[id([\\d]+)\\|', text)\n@@ -36,7 +36,7 @@ Welcome to VKBottle! VKBottle is a useful client with useful facilities for work\n* For messages\n- ```\n+ ```python\n@bot.on.message.startswith('my opinion: <opinion>', validators=(validators.SafeMessage))\n```\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 Added python highlighting to code samples |
718,838 | 04.10.2019 19:22:35 | -10,800 | 23caffb823e6f6396294f8090eaa7ee72a78c8ba | v0.1 Removed logging where was no need added Message Typing | [
{
"change_type": "MODIFY",
"old_path": "vkbottle2/__init__.py",
"new_path": "vkbottle2/__init__.py",
"diff": "from .framework import Bot\n-\n+from .types.message import Message\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle2/utils/task.py",
"new_path": "vkbottle2/utils/task.py",
"diff": "import asyncio\nfrom asyncio import iscoroutinefunction\n-import logging\nfrom typing import List, Callable\n-logger = logging.getLogger(__name__)\n-\nclass TaskQueue:\ndef __init__(self, loop: asyncio.AbstractEventLoop):\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 Removed logging where was no need added Message Typing |
718,838 | 04.10.2019 19:27:20 | -10,800 | 162fef83f23cf1ae107caa190c539788b72d9dfb | edition in commercial.md | [
{
"change_type": "MODIFY",
"old_path": "COMMERCIAL.md",
"new_path": "COMMERCIAL.md",
"diff": "@@ -14,7 +14,7 @@ Welcome to VKBottle! VKBottle is a useful client with useful facilities for work\n@bot.on.message.lower('plastify <material:usage>', validators=(validators.SafeMessage)}:\nasync def handler(ans: Message, material):\npoll = Poll('Material {} is cool?'.format(material)).add(('yes', 'noh'))\n- await ans('Wow it\\'s a poll!', poll, Photo(owner=1, id=327778612))\n+ ans('Wow it\\'s a poll!', poll, Photo(owner=1, id=327778612))\n```\n* :couple_with_heart_woman_man:Validators for arguments in messages and also messages\n@@ -31,7 +31,7 @@ Welcome to VKBottle! VKBottle is a useful client with useful facilities for work\n@bot.on.message('id <uid:some_user>')\nasync def handler(ans: Message, uid):\n- await ans(uid)\n+ ans(uid)\n```\n* For messages\n@@ -40,4 +40,3 @@ Welcome to VKBottle! VKBottle is a useful client with useful facilities for work\n@bot.on.message.startswith('my opinion: <opinion>', validators=(validators.SafeMessage))\n```\n-* HTTP Executor (self)\n"
}
] | Python | MIT License | vkbottle/vkbottle | edition in commercial.md |
718,838 | 04.10.2019 20:20:18 | -10,800 | d78a3f12e4f9881af0e3cc7dfa64c62a10564bdd | v0.1 Callback ex | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -45,6 +45,27 @@ if __name__ == '__main__':\nbot.run()\n```\n+### Callback\n+\n+```python\n+from vkbottle import Bot, Message\n+from flask import request\n+# app = Flask()\n+\n+bot = Bot('my-token', 123, debug=True)\n+confirmation = 'MyConfirmationCode'\n+\n+\n+@app.route('/')\n+def route():\n+ bot.process(event=request.args(), confirmation_token=confirmation)\n+\n+\n+@bot.on.message('My name is <name>')\n+async def wrapper(ans: Message, name):\n+ await ans('Hello, {}'.format(name))\n+```\n+\nMore examples positioned in directory [/examples](./examples)\n### Docs\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 Callback ex |
718,838 | 04.10.2019 20:44:25 | -10,800 | 4f6a9768991a460d48f289dd5cb48914cc0606b4 | v0.1 Added actions and chat messages processing | [
{
"change_type": "MODIFY",
"old_path": "COMMERCIAL.md",
"new_path": "COMMERCIAL.md",
"diff": "@@ -40,3 +40,20 @@ Welcome to VKBottle! VKBottle is a useful client with useful facilities for work\n@bot.on.message.startswith('my opinion: <opinion>', validators=(validators.SafeMessage))\n```\n+* VBML (VKBottle Matching Language) and Pure Regex support\n+\n+ > pure regex:\n+ >\n+ > ```\n+ > https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)\n+ > ```\n+\n+ > VBML:\n+ >\n+ > ```regex\n+ > <:browserE(:https)>\n+ > # or for vk.com\n+ > <:browserE(:https:vk.com)>\n+ > ```\n+\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/TODO.md",
"new_path": "docs/TODO.md",
"diff": "@@ -4,9 +4,9 @@ There is a list of checkboxes of implementing functions in VKBottle\n### :tada:0.15:\n-- [ ] **Callback Support**\n+- [x] **Callback Support**\n-- [ ] Events Queue executor\n+- [x] Events Queue executor\n- [x] Patcher for message variables types `(by timoniq)`\n@@ -18,10 +18,8 @@ There is a list of checkboxes of implementing functions in VKBottle\n### :mortar_board:Pull your suggests here:\n-- [ ] HTTP Request maker for callback & longpoll `(idea by 1)`\n+- [x] HTTP Request maker for callback & longpoll `(idea by 1)`\n### :heart:Thanks for Idea to\n-1. `@vasilkovivan`\n-\n-\n+@vasilkovivan`\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle2/framework/bot.py",
"new_path": "vkbottle2/framework/bot.py",
"diff": "@@ -46,11 +46,11 @@ class Bot(EventProcessor):\nensure_future(self._private_message_processor(obj=obj))\n- \"\"\"else:\n+ else:\nif 'action' not in obj:\n- await self.new_chat_message(obj=obj)\n+ ensure_future(self._chat_message_processor(obj=obj))\nelse:\n- await self.new_chat_action(obj=obj)\"\"\"\n+ ensure_future(self._chat_action_processor(obj=obj))\nelse:\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle2/framework/processor.py",
"new_path": "vkbottle2/framework/processor.py",
"diff": "@@ -16,6 +16,12 @@ class EventProcessor(object):\nasync def _private_message_processor(self, obj: dict):\nanswer = Message(**obj, api=[self.api])\n+ self._logger.debug(\n+ '-> MESSAGE FROM CHAT {} TEXT \"{}\" TIME #'.format(\n+ obj['peer_id'],\n+ obj['text'].replace('\\n', ' ')\n+ ))\n+\nfor key in self.on.message.inner:\nif key.match(answer.text) is not None:\nmatching = self.on.message.inner[key]\n@@ -46,3 +52,58 @@ class EventProcessor(object):\nelse:\nself._logger.info('Add on-undefined message handler!')\n+ async def _chat_message_processor(self, obj: dict):\n+ answer = Message(**obj, api=[self.api])\n+\n+ for key in self.on.chat_message.inner:\n+ if key.match(answer.text) is not None:\n+ matching = self.on.chat_message.inner[key]\n+\n+ validators_check = await self.patcher.check_validators(\n+ check_object=matching,\n+ keys=key.match(answer.text).groupdict())\n+\n+ if validators_check is not None:\n+ # [Feature] Async Use\n+ # Added v0.19#master\n+ ensure_future(\n+ matching['call'](\n+ answer,\n+ **validators_check\n+ ))\n+\n+ self._logger.debug(\n+ 'New message compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})'.format(\n+ matching['call'].__name__,\n+ answer.from_id\n+ )\n+ )\n+ return True\n+\n+ async def _chat_action_processor(self, obj: dict):\n+ \"\"\"\n+ Chat Action Processor\n+ :param obj:\n+ :return: VK Server Event Object\n+ \"\"\"\n+ action = obj['action']\n+\n+ self._logger.debug(\n+ '-> ACTION FROM CHAT {} TYPE \"{}\" TIME #'.format(\n+ obj['peer_id'],\n+ action['type']\n+ ))\n+\n+ if action['type'] in self.on.chat_action_types:\n+ if {**action, **self.on.chat_action_types[action['type']]['rules']} == action:\n+ answer = Message(**obj, api=[self.api])\n+\n+ await self.on.chat_action_types[action['type']]['call'](answer)\n+\n+ self._logger.debug(\n+ 'New action compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})'.format(\n+ self.on.chat_action_types[action['type']]['call'].__name__,\n+ answer.from_id\n+ )\n+ )\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle2/handler/handler.py",
"new_path": "vkbottle2/handler/handler.py",
"diff": "@@ -58,6 +58,10 @@ class Handler(object):\ndef undefined_func(self):\nreturn self.__undefined_message_func\n+ @property\n+ def chat_action_types(self):\n+ return self.__chat_action_types\n+\nclass MessageHandler:\ndef __init__(self):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle2/utils/task.py",
"new_path": "vkbottle2/utils/task.py",
"diff": "@@ -27,7 +27,6 @@ class TaskQueue:\n[self.loop.create_task(task()) for task in self.tasks]\n- logger.info(\"Loop started!\")\nself.loop.run_forever()\nfinally:\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 Added actions and chat messages processing |
718,838 | 04.10.2019 21:14:46 | -10,800 | f96bee2c8b2a3a0dee6fb4c95a67585a2d2a2ad2 | v0.1 Log fixes | [
{
"change_type": "MODIFY",
"old_path": "vkbottle2/framework/bot.py",
"new_path": "vkbottle2/framework/bot.py",
"diff": "@@ -43,9 +43,7 @@ class Bot(EventProcessor):\nif update['type'] == EventTypes.MESSAGE_NEW:\nif obj['peer_id'] < 2e9:\n-\nensure_future(self._private_message_processor(obj=obj))\n-\nelse:\nif 'action' not in obj:\nensure_future(self._chat_message_processor(obj=obj))\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle2/framework/processor.py",
"new_path": "vkbottle2/framework/processor.py",
"diff": "@@ -17,9 +17,9 @@ class EventProcessor(object):\nanswer = Message(**obj, api=[self.api])\nself._logger.debug(\n- '-> MESSAGE FROM CHAT {} TEXT \"{}\" TIME #'.format(\n- obj['peer_id'],\n- obj['text'].replace('\\n', ' ')\n+ '-> MESSAGE FROM {} TEXT \"{}\" TIME #'.format(\n+ answer.from_id,\n+ answer.text.replace('\\n', ' ')\n))\nfor key in self.on.message.inner:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle2/utils/logger.py",
"new_path": "vkbottle2/utils/logger.py",
"diff": "@@ -4,6 +4,7 @@ from typing import Any\nfrom termcolor import colored\nfrom colorama import init as color_opt\nimport re\n+import time\nLOG_FILE_PATTERN = r'[a-zA-Z0-9]+\\.log'\n@@ -16,7 +17,8 @@ class Coloring(object):\nself.prefix = '[' + colored('VKBottle', 'blue') + ']'\ndef __call__(self, text: str, color: str = 'white') -> colored:\n- return '{prefix} {text}'.format(prefix=self.prefix, text=colored(text, color))\n+ return '{prefix} {text}'.format(prefix=self.prefix,\n+ text=colored(text.replace('#', time.strftime(\"%m-%d %H:%M:%S\", time.gmtime()))))\nclass Logger(object):\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 Log fixes |
718,838 | 05.10.2019 11:40:39 | -10,800 | 525e6a651bbf0bd5414ea195dd51287688cf577f | v0.1 longpoll release
* everything is updated
+ logging fix | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -50,7 +50,7 @@ async def wrapper(ans: Message, name):\nif __name__ == '__main__':\n- bot.run()\n+ bot.run_polling()\n```\n### Callback\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/simple_bot.py",
"new_path": "examples/simple_bot.py",
"diff": "@@ -17,7 +17,7 @@ async def wrapper(ans: Message):\n@bot.on.event.group_join()\nasync def wrapper(event: events.GroupJoin):\n- bot.api.messages.send(peer_id=event.user_id, random_id=100, message='Welcome to the group!')\n+ await bot.api.messages.send(peer_id=event.user_id, random_id=100, message='Welcome to the group!')\n@bot.error_handler(901, 902)\n@@ -26,4 +26,4 @@ async def error(error: list):\nif __name__ == '__main__':\n- bot.run()\n+ bot.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "portable/PORTABLE.json",
"new_path": "portable/PORTABLE.json",
"diff": "{\n\"version\": \"0.15\",\n- \"license\": \"MIT\",\n+ \"license\": \"GPL-3.0\",\n\"author\": \"Arseniy Timonik\"\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/__init__.py",
"new_path": "vkbottle/api/__init__.py",
"diff": "from .api import Api\n-from . import exceptions\n+from .exceptions import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "from ..api import Api\n-from ..handler import Handler\n+from ..handler import Handler, ErrorHandler\nfrom ..const import DEFAULT_BOT_FOLDER\nfrom ..utils import Logger\n+from ..http import HTTP\n+from ..api import VKError\nfrom asyncio import get_event_loop, AbstractEventLoop, ensure_future\n+from aiohttp.client_exceptions import ClientConnectionError, ServerTimeoutError\nfrom ._event import EventTypes\nfrom .processor import EventProcessor\nfrom .patcher import Patcher\n-class Bot(EventProcessor):\n+DEFAULT_WAIT = 20\n+\n+\n+class Bot(HTTP, EventProcessor):\ndef __init__(self,\ntoken: str,\ngroup_id: int,\n@@ -19,11 +25,13 @@ class Bot(EventProcessor):\nself.__group_id: int = group_id\nself.__loop: AbstractEventLoop = get_event_loop()\nself.__debug = debug\n+ self.__wait = None\nself.api = Api(loop=self.__loop, token=token, group_id=group_id)\nself.patcher = Patcher(plugin_folder or DEFAULT_BOT_FOLDER)\nself._logger = Logger(debug, log_file=log_to, plugin_folder=self.patcher.plugin_folder)\nself.on = Handler(self._logger, group_id)\n+ self.error_handler = ErrorHandler()\n@property\ndef group_id(self):\n@@ -33,6 +41,64 @@ class Bot(EventProcessor):\ndef get_loop(self):\nreturn self.__loop\n+ async def get_server(self) -> dict:\n+ \"\"\"\n+ Get an longPoll server for long request create\n+ :return: LongPoll Server\n+ \"\"\"\n+ return await self.api.groups.getLongPollServer(group_id=self.group_id)\n+\n+ async def make_long_request(self, longPollServer: dict) -> dict:\n+ \"\"\"\n+ Make longPoll request to the VK Server. Comes off after wait time\n+ :param longPollServer:\n+ :return: VK LongPoll Event\n+ \"\"\"\n+ url = \"{}?act=a_check&key={}&ts={}&wait={}&rps_delay=0\".format(\n+ longPollServer['server'],\n+ longPollServer['key'],\n+ longPollServer['ts'],\n+ self.__wait or DEFAULT_WAIT\n+ )\n+ return await self.request.post(url)\n+\n+ def run_polling(self):\n+ loop = self.__loop\n+ try:\n+ loop.run_until_complete(self._run_polling())\n+ except KeyboardInterrupt:\n+ self._logger.warning('KB interrupt')\n+\n+ async def _run_polling(self, wait: int = DEFAULT_WAIT):\n+ self.__wait = wait\n+ self._logger.info('LongPoll will be runned. Is it OK?')\n+\n+ longPollServer = await self.get_server()\n+\n+ while True:\n+ try:\n+ event = await self.make_long_request(longPollServer)\n+ ensure_future(self.process(event))\n+ longPollServer = await self.get_server()\n+\n+ except ClientConnectionError or ServerTimeoutError:\n+ # No internet connection\n+ await self._logger.warning('Server Timeout Error!')\n+\n+ except VKError as error:\n+ error = list(error.args)[0]\n+\n+ if error[0] in self.error_handler.get_processor():\n+ handler = self.error_handler.get_processor()[error[0]]['call']\n+\n+ self._logger.debug('VKError #{}! Processing it with handler <{}>'.format(error, handler.__name__))\n+ ensure_future(handler(error))\n+ longPollServer = await self.get_server()\n+\n+ else:\n+ self._logger.error('VKError! Add @bot.error_handler({}) to process this error!'.format(error))\n+ raise VKError(error)\n+\nasync def process(self, event: dict, confirmation_token: str = None):\nif 'type' in event and event['type'] == 'confirmation':\nif event['group_id'] == self.group_id:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -49,6 +49,11 @@ class EventProcessor(object):\nif self.on.undefined_func:\nensure_future(self.on.undefined_func(answer))\n+ self._logger.debug(\n+ 'New message compiled with decorator <\\x1b[35mon-message-undefined\\x1b[0m> (from: {})'.format(\n+ answer.from_id\n+ )\n+ )\nelse:\nself._logger.info('Add on-undefined message handler!')\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/__init__.py",
"new_path": "vkbottle/handler/__init__.py",
"diff": "from .handler import Handler\n+from .error import ErrorHandler\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/handler/error.py",
"diff": "+class ErrorHandler(object):\n+ def __init__(self):\n+ self._error_processors = dict()\n+\n+ def __call__(self, *error_numbers):\n+ def decorator(func):\n+ for error_number in error_numbers:\n+ self._error_processors[error_number] = {'call': func}\n+ return func\n+ return decorator\n+\n+ def get_processor(self):\n+ return self._error_processors\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/__init__.py",
"new_path": "vkbottle/http/__init__.py",
"diff": "-from .request import HTTPRequest\n\\ No newline at end of file\n+from .request import HTTP, HTTPRequest\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/request.py",
"new_path": "vkbottle/http/request.py",
"diff": "@@ -21,7 +21,7 @@ class HTTPRequest(object):\naioHTTP Request Wrapper\n\"\"\"\ndef __init__(self):\n- self.client = ClientSession(json_serialize=json.dumps)\n+ pass\n@request\nasync def post(self,\n@@ -41,3 +41,7 @@ class HTTPRequest(object):\n):\nasync with client.get(url, ssl=ssl.SSLContext()) as response:\nreturn await response.json(content_type=content_type)\n+\n+\n+class HTTP(object):\n+ request = HTTPRequest()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -19,7 +19,7 @@ class Coloring(object):\ndef __call__(self, text: str, color: str = 'white') -> colored:\nreturn '{prefix} {text}'.format(prefix=self.prefix,\n- text=colored(text.replace('#', time.strftime(\"%m-%d %H:%M:%S\", time.gmtime()))))\n+ text=colored(text.replace('#', time.strftime(\"%m-%d %H:%M:%S\", time.gmtime())), color))\nclass Logger(object):\n@@ -38,7 +38,6 @@ class Logger(object):\nlog_path = '{path}/{log_file}'.format(\npath=plugin_folder,\nlog_file=log_file if log_file and re.match(LOG_FILE_PATTERN, log_file) else DEFAULT_LOG_NAME)\n- print(log_path)\nopen(log_path, 'w+').close()\nself.logger.setLevel(self.__level)\n@@ -49,6 +48,8 @@ class Logger(object):\nhandler.setFormatter(formatter)\nself.logger.addHandler(handler)\n+ self.debug('My logging file path is {}'.format(log_path))\n+\ndef info(self, *some: Any):\nself.logger.info(*some)\n@@ -57,10 +58,15 @@ class Logger(object):\nif self.__debug:\nprint(self.__coloring(' '.join([str(i) for i in some])))\n+ def mark(self, *some):\n+ self.logger.debug(*some)\n+ if self.__debug:\n+ print(self.__coloring(' '.join([str(i) for i in some]), 'grey'))\n+\ndef warning(self, *some):\nself.logger.debug(*some)\nif self.__debug:\n- print(self.__coloring(' '.join([str(i) for i in some]), 'magenta'))\n+ print(self.__coloring(' '.join([str(i) for i in some]), 'yellow'))\ndef error(self, *some):\nself.logger.debug(*some)\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 longpoll release
* everything is updated
+ logging fix |
718,838 | 06.10.2019 09:36:20 | -10,800 | bc8ebd925274472c4468ca49e1f01aed4060491b | v0.1 added events
& docs :shipit: | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -32,7 +32,6 @@ class Method(object):\nVK API Method Wrapper\n:param group: method group\n:param method: method name\n- :param data: method options\n:return: VK API Server Response\n\"\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -122,10 +122,8 @@ class Bot(HTTP, EventProcessor):\nensure_future(self._chat_action_processor(obj=obj))\nelse:\n- pass\n- # If this is an event of the group\n- # await self.new_event(event_type=update['type'], obj=obj)\n+ if obj['from_id'] != -self.group_id:\n+ # If this is an event of the group AND this is not SELF-EVENT\n+ ensure_future(self._event_processor(obj=obj, event_type=update['type']))\nreturn 'ok'\n-\n-\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/patcher/validators/vbml.py",
"new_path": "vkbottle/framework/patcher/validators/vbml.py",
"diff": "from urllib import parse\n+\nclass VBMLValidators:\ndef __init__(self):\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -14,6 +14,11 @@ class EventProcessor(object):\n__loop: AbstractEventLoop\nasync def _private_message_processor(self, obj: dict):\n+ \"\"\"\n+ Private message processor. Using regex to process regular expressions in messages\n+ :param obj: VK API Event Object\n+ \"\"\"\n+\nanswer = Message(**obj, api=[self.api])\nself._logger.debug(\n@@ -58,6 +63,11 @@ class EventProcessor(object):\nself._logger.info('Add on-undefined message handler!')\nasync def _chat_message_processor(self, obj: dict):\n+ \"\"\"\n+ Chat messages processor. Using regex to process regular expressions in messages\n+ :param obj: VK API Event Object\n+ \"\"\"\n+\nanswer = Message(**obj, api=[self.api])\nfor key in self.on.chat_message.inner:\n@@ -98,6 +108,7 @@ class EventProcessor(object):\n:param obj:\n:return: VK Server Event Object\n\"\"\"\n+\naction = obj['action']\nself._logger.debug(\n@@ -110,7 +121,7 @@ class EventProcessor(object):\nif {**action, **self.on.chat_action_types[action['type']]['rules']} == action:\nanswer = Message(**obj, api=[self.api])\n- await self.on.chat_action_types[action['type']]['call'](answer)\n+ ensure_future(self.on.chat_action_types[action['type']]['call'](answer))\nself._logger.debug(\n'New action compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})'.format(\n@@ -119,3 +130,30 @@ class EventProcessor(object):\n)\n)\n+ async def _event_processor(self, obj: dict, event_type: str):\n+ \"\"\"\n+ LongPoll Events Processor\n+ :param event_type: VK Server Event Type\n+ :param obj: VK Server Event Object\n+ \"\"\"\n+\n+ self._logger.debug(\n+ '-> EVENT FROM {} TYPE \"{}\" TIME #'.format(\n+ obj['from_id'],\n+ event_type.upper()\n+ )\n+ )\n+\n+ if event_type in self.on.event.events:\n+ event_processor = self.on.event.events[event_type]\n+ data = event_processor['data'](**obj, api=[self.api])\n+\n+ ensure_future(event_processor['call'](data))\n+\n+ self._logger.debug(\n+ 'New event compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})'.format(\n+ event_processor['call'].__name__,\n+ data.from_id\n+ )\n+ )\n+ return True\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/__init__.py",
"new_path": "vkbottle/types/__init__.py",
"diff": "from . import additional, attachments\n-from .base import BaseModel\nfrom .user import User\nfrom .message import Message\n+from .events.community.events_objects import *\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 added events
& docs :shipit: |
718,838 | 06.10.2019 11:08:58 | -10,800 | b604e7abc2582651721187e847466c3c0f7c466d | v0.1 Validators docs
+ added test validator | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "***\n-### Usage\n+### Longpoll\n```python\nfrom vkbottle import Bot, Message\n@@ -81,7 +81,6 @@ More examples positioned in directory [/examples](./examples)\nFull docs you can find here:\n* [Russian Version](./docs/readme.ru.md)\n-* [English Version](./docs/kriper2005.txt)\n# Contributing\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/patcher/validators/vbml.py",
"new_path": "vkbottle/framework/patcher/validators/vbml.py",
"diff": "@@ -21,3 +21,7 @@ class VBMLValidators:\nif scheme.netloc != '':\nreturn value\nreturn\n+\n+ async def validator(self, value: str):\n+ print('Value {} was validated by default validator! Hold on.')\n+ return value\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 Validators docs
+ added test validator |
718,838 | 06.10.2019 17:03:07 | -10,800 | 62f6af7582fb0d1d843c681e9368e263b9198bec | v0.1 CB Event fix | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -109,7 +109,9 @@ class Bot(HTTP, EventProcessor):\nif event['group_id'] == self.group_id:\nreturn confirmation_token or 'dissatisfied'\n- for update in event['updates']:\n+ updates = event['updates'] if 'updates' in event else [event]\n+\n+ for update in updates:\nobj = update['object']\nif update['type'] == EventTypes.MESSAGE_NEW:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/patcher/validators/vbml.py",
"new_path": "vkbottle/framework/patcher/validators/vbml.py",
"diff": "@@ -23,5 +23,5 @@ class VBMLValidators:\nreturn\nasync def validator(self, value: str):\n- print('Value {} was validated by default validator! Hold on.')\n+ print('Value {} was validated by default validator! Hold on.'.format(value))\nreturn value\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 CB Event fix |
718,838 | 06.10.2019 21:15:28 | -10,800 | 6f2a81bacdaa5b363df303f37484b8a67b46a8d1 | v0.1 keyboard gen | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "from .framework import Bot\nfrom .types.message import Message\nfrom .utils.task import TaskQueue\n+from .api.keyboard import keyboard_gen\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/keyboard/__init__.py",
"diff": "+from .generator import keyboard_gen\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/keyboard/generator.py",
"diff": "+from typing import List, Dict\n+\n+try:\n+ import ujson as json\n+except ImportError:\n+ import json\n+\n+\n+def keyboard_gen(pattern: List[List[Dict]], one_time: bool = True):\n+ \"\"\"Simple keyboard constructor\n+ :param pattern: Keyboard simple pattern, check github readme\n+ :param one_time: Should keyboard be hidden after first use?\n+ :return: VK Api Keyboard JSON\n+ \"\"\"\n+ rows = pattern\n+ buttons = list()\n+ for row in rows:\n+ row_buttons = list()\n+ for button in row:\n+ row_buttons.append(dict(\n+ action=dict(\n+ type=\"text\" if 'type' not in button else button['type'],\n+ label=button['text'],\n+ payload=json.dumps(\"\" if 'payload' not in button else button['payload'])\n+ ),\n+ color=\"default\" if 'color' not in button else button['color']\n+ )\n+ )\n+ buttons.append(row_buttons)\n+\n+ keyboard = str(json.dumps(\n+ dict(\n+ one_time=one_time,\n+ buttons=buttons\n+ ),\n+ ensure_ascii=False\n+ ).encode('utf-8').decode('utf-8'))\n+\n+ return keyboard\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 keyboard gen |
718,838 | 07.10.2019 17:46:35 | -10,800 | 681960dfe2c53660fae8110693f1decc1025fd9f | v0.1 log options | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -20,6 +20,7 @@ class Bot(HTTP, EventProcessor):\ngroup_id: int,\ndebug: bool = True,\nplugin_folder: str = None,\n+ log_to_file: bool = True,\nlog_to: str = None):\nself.__token: str = token\nself.__group_id: int = group_id\n@@ -30,7 +31,10 @@ class Bot(HTTP, EventProcessor):\nself.api = Api(loop=self.__loop, token=token, group_id=group_id)\nself.patcher = Patcher(plugin_folder or DEFAULT_BOT_FOLDER)\n- self._logger = Logger(debug, log_file=log_to, plugin_folder=self.patcher.plugin_folder)\n+ self._logger = Logger(debug,\n+ log_file=log_to,\n+ plugin_folder=self.patcher.plugin_folder,\n+ logger_enabled=log_to_file)\nself.on = Handler(self._logger, group_id)\nself.error_handler = ErrorHandler()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -28,7 +28,8 @@ class Logger(object):\nlog_file: str,\nplugin_folder: str,\nlevel=None,\n- logger_name: str = None):\n+ logger_name: str = None,\n+ logger_enabled: bool = True):\nself.__debug: bool = debug\nself.__coloring = Coloring()\n@@ -39,6 +40,8 @@ class Logger(object):\npath=plugin_folder,\nlog_file=log_file if log_file and re.match(LOG_FILE_PATTERN, log_file) else DEFAULT_LOG_NAME)\n+ if logger_enabled:\n+\nopen(log_path, 'w+').close()\nself.logger.setLevel(self.__level)\nformatter = logging.Formatter(LOG_FORMAT)\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 log options |
718,838 | 07.10.2019 19:40:27 | -10,800 | 3925ddc44eb09ccb97c47d94984692801ed08eb5 | v0.1 callback example | [
{
"change_type": "DELETE",
"old_path": "examples/README.rst",
"new_path": null,
"diff": "-Examples of VKBottle\n---------------------\n-If you find a mistake or deprecated names in examples, please contact me in VK Chat or make an issue\n-\n-Please make pull requests for new examples\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "examples/bot_decorators_demo.py",
"new_path": "examples/bot_decorators.py",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/callback_bot.py",
"diff": "+from vkbottle import Message, Bot, keyboard_gen\n+from flask import request, Flask\n+import sys\n+\n+app = Flask(__name__)\n+bot = Bot(token=open('token').readline(),\n+ group_id=1,\n+ debug=True,)\n+confirmation = 'MyConfirmation'\n+\n+keyboard = keyboard_gen(\n+[\n+ [\n+ {'text': 'do $ex'},\n+ {'text': 'make me con', 'color': 'negative'}\n+ ],\n+ [\n+ {'text': 'cry..'}\n+ ]\n+],\n+ one_time=True)\n+\n+\n+@app.route('/bot')\n+def route():\n+ event = request.get_json(force=True, silent=True)\n+ return bot.process(event, confirmation_token=confirmation)\n+\n+\n+@bot.on.message_both.lower('hi <name>')\n+async def wrapper(ans: Message, name):\n+ await ans(f'i\\'m not a {name}', keyboard=keyboard)\n"
},
{
"change_type": "RENAME",
"old_path": "examples/simple_bot.py",
"new_path": "examples/longpoll_bot.py",
"diff": ""
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 callback example |
718,838 | 13.10.2019 11:48:44 | -10,800 | 1da6f1f446e3e86ec18decfa3ab81d90bcc7ffb1 | v0.1 Pl Updates | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -80,7 +80,7 @@ More examples positioned in directory [/examples](./examples)\nFull docs you can find here:\n-* [Russian Version](./docs/readme.ru.md)\n+* [Russian Version](docs/README.RU.md)\n# Contributing\n"
},
{
"change_type": "RENAME",
"old_path": "docs/readme.ru.md",
"new_path": "docs/README.RU.md",
"diff": ""
},
{
"change_type": "DELETE",
"old_path": "docs/kriper2005.txt",
"new_path": null,
"diff": "-Sorry, but developer of this project is too lazy to make a normal docs.. Please help him and make pull requests\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -2,3 +2,5 @@ from .framework import Bot\nfrom .types.message import Message\nfrom .utils.task import TaskQueue\nfrom .api.keyboard import keyboard_gen\n+from .api.exceptions import *\n+from .api.fetch_method import FetchMethod\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/exceptions.py",
"new_path": "vkbottle/api/exceptions.py",
"diff": "class VKError(Exception):\npass\n+\n+\n+class FetchMethodError(Exception):\n+ pass\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/api/fetch_method.py",
"diff": "+from ..framework import Bot\n+from .exceptions import FetchMethodError\n+from asyncio import iscoroutinefunction\n+from typing import Callable, Optional\n+\n+\n+async def assign_function(*args, **kwargs):\n+ raise FetchMethodError('Please assign FM Function')\n+\n+\n+def assigned(iterator):\n+ if len(iterator) > 0:\n+ return True\n+\n+\n+class FetchMethod(object):\n+ def __init__(self, bot: Bot):\n+ self.api: Bot.api = bot.api\n+\n+ def __call__(self, desc: str = None):\n+ return Fetching(self.api)\n+\n+\n+class Fetching:\n+ def __init__(self, api):\n+ self.api: Bot.api = api\n+ self.running_func: Callable = assign_function\n+ self.args: list = []\n+ self.kwargs: dict = {}\n+\n+ def __call__(self, function: Callable = None, *args, IGNORE_CORO=True, **kwargs):\n+ if not iscoroutinefunction(function) and not IGNORE_CORO:\n+ raise FetchMethodError('Function is not awaitable (make it async)')\n+ self.running_func = function or self.running_func\n+ if assigned(args):\n+ self.args = args\n+ if assigned(kwargs):\n+ self.kwargs = kwargs\n+\n+ return self\n+\n+ async def run(self):\n+ response = await self.running_func(*self.args, **self.kwargs)\n+ return response\n+\n+ async def run_without_response(self):\n+ await self.running_func(*self.args, **self.kwargs)\n+ return self\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -4,7 +4,7 @@ from ..const import DEFAULT_BOT_FOLDER\nfrom ..utils import Logger\nfrom ..http import HTTP\nfrom ..api import VKError\n-from asyncio import get_event_loop, AbstractEventLoop, ensure_future\n+from asyncio import get_event_loop, AbstractEventLoop, ensure_future, TimeoutError\nfrom aiohttp.client_exceptions import ClientConnectionError, ServerTimeoutError\nfrom ._event import EventTypes\nfrom .processor import EventProcessor\n@@ -83,28 +83,14 @@ class Bot(HTTP, EventProcessor):\nwhile True:\ntry:\nevent = await self.make_long_request(longPollServer)\n- ensure_future(self.process(event))\n+ ensure_future(self._process(event))\nlongPollServer = await self.get_server()\n- except ClientConnectionError or ServerTimeoutError:\n+ except ClientConnectionError or ServerTimeoutError or TimeoutError:\n# No internet connection\nawait self._logger.warning('Server Timeout Error!')\n- except VKError as error:\n- error = list(error.args)[0]\n-\n- if error[0] in self.error_handler.get_processor():\n- handler = self.error_handler.get_processor()[error[0]]['call']\n-\n- self._logger.debug('VKError #{}! Processing it with handler <{}>'.format(error, handler.__name__))\n- ensure_future(handler(error))\n- longPollServer = await self.get_server()\n-\n- else:\n- self._logger.error('VKError! Add @bot.error_handler({}) to process this error!'.format(error))\n- raise VKError(error)\n-\n- async def process(self, event: dict, confirmation_token: str = None):\n+ async def _process(self, event: dict, confirmation_token: str = None):\nif not self.__dispatched:\nself.on.dispatch()\nself.__dispatched = True\n@@ -114,22 +100,40 @@ class Bot(HTTP, EventProcessor):\nreturn confirmation_token or 'dissatisfied'\nupdates = event['updates'] if 'updates' in event else [event]\n+ try:\nfor update in updates:\nobj = update['object']\nif update['type'] == EventTypes.MESSAGE_NEW:\nif obj['peer_id'] < 2e9:\n- ensure_future(self._private_message_processor(obj=obj))\n+ task = ensure_future(self._private_message_processor(obj=obj))\nelse:\nif 'action' not in obj:\n- ensure_future(self._chat_message_processor(obj=obj))\n+ task = ensure_future(self._chat_message_processor(obj=obj))\nelse:\n- ensure_future(self._chat_action_processor(obj=obj))\n+ task = ensure_future(self._chat_action_processor(obj=obj))\n+\n+ await task\nelse:\nif obj['from_id'] != -self.group_id:\n# If this is an event of the group AND this is not SELF-EVENT\n- ensure_future(self._event_processor(obj=obj, event_type=update['type']))\n+ task = ensure_future(self._event_processor(obj=obj, event_type=update['type']))\n+ await task\n+\n+ except VKError as e:\n+ e = list(e.args)[0]\n+ if e[0] in self.error_handler.get_processor():\n+ handler = self.error_handler.get_processor()[e[0]]['call']\n+ self._logger.debug('VKError ?{}! Processing it with handler <{}>'.format(e, handler.__name__))\n+ ensure_future(handler(e))\n+ else:\n+ self._logger.error('VKError! Add @bot.error_handler({}) to process this error!'.format(e))\n+ raise VKError(e)\nreturn 'ok'\n+\n+ def process(self, event: dict, confirmation_token: str = None) -> str:\n+ status = ensure_future(self._process(event, confirmation_token))\n+ return await status\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -38,11 +38,11 @@ class EventProcessor(object):\nif validators_check is not None:\n# [Feature] Async Use\n# Added v0.19#master\n- ensure_future(\n- matching['call'](\n+\n+ await matching['call'](\nanswer,\n**validators_check\n- ))\n+ )\nself._logger.debug(\n'New message compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})'.format(\n@@ -88,11 +88,10 @@ class EventProcessor(object):\nif validators_check is not None:\n# [Feature] Async Use\n# Added v0.19#master\n- ensure_future(\n- matching['call'](\n+ await matching['call'](\nanswer,\n**validators_check\n- ))\n+ )\nself._logger.debug(\n'New message compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})'.format(\n@@ -121,7 +120,7 @@ class EventProcessor(object):\nif {**action, **self.on.chat_action_types[action['type']]['rules']} == action:\nanswer = Message(**obj, api=[self.api])\n- ensure_future(self.on.chat_action_types[action['type']]['call'](answer))\n+ await self.on.chat_action_types[action['type']]['call'](answer)\nself._logger.debug(\n'New action compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})'.format(\n@@ -148,7 +147,7 @@ class EventProcessor(object):\nevent_processor = self.on.event.events[event_type]\ndata = event_processor['data'](**obj, api=[self.api])\n- ensure_future(event_processor['call'](data))\n+ await event_processor['call'](data)\nself._logger.debug(\n'New event compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})'.format(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "-import logging\n+from typing import Union\nfrom .regex import vbml_parser, re_parser\nfrom .events import Event\nfrom ..utils import dict_of_dicts_merge, Logger\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 Pl Updates |
718,838 | 13.10.2019 14:04:23 | -10,800 | b8d18bc01622df239c45d72cdcd0a95ac740b487 | fix repair fixik kto takie fixiki | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -135,5 +135,5 @@ class Bot(HTTP, EventProcessor):\nreturn 'ok'\ndef process(self, event: dict, confirmation_token: str = None) -> str:\n- status = ensure_future(self._process(event, confirmation_token))\n- return await status\n+ status = self.__loop.run_until_complete(self._process(event, confirmation_token))\n+ return status\n"
}
] | Python | MIT License | vkbottle/vkbottle | fix repair fixik kto takie fixiki |
718,838 | 14.10.2019 18:33:02 | -10,800 | 4a97e5dc7450bf06d82920a8e6eaee5465264880 | v0.2 Val Arguments
with docs | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -117,7 +117,8 @@ class Bot(HTTP, EventProcessor):\nawait task\nelse:\n- if obj['from_id'] != -self.group_id:\n+ print(obj)\n+ if -self.group_id not in obj.values():\n# If this is an event of the group AND this is not SELF-EVENT\ntask = ensure_future(self._event_processor(obj=obj, event_type=update['type']))\nawait task\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/patcher/patcher.py",
"new_path": "vkbottle/framework/patcher/patcher.py",
"diff": "@@ -46,7 +46,7 @@ class Patcher(WhiteList):\nfor key in keys:\nif key in validators:\nfor validator in validators[key]:\n- k = await self.regex_validators[validator](keys[key])\n+ k = await self.regex_validators[validator](keys[key], *validators[key][validator])\nif k is None:\nvalid_dict = None\nbreak\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/patcher/validators/vbml.py",
"new_path": "vkbottle/framework/patcher/validators/vbml.py",
"diff": "@@ -22,6 +22,6 @@ class VBMLValidators:\nreturn value\nreturn\n- async def validator(self, value: str):\n- print('Value {} was validated by default validator! Hold on.'.format(value))\n+ async def validator(self, value: str, *args):\n+ print('Value {} was validated by default validator! Hold on.\\nReceived args: {}'.format(value, args))\nreturn value\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -22,7 +22,7 @@ class EventProcessor(object):\nanswer = Message(**obj, api=[self.api])\nself._logger.debug(\n- '-> MESSAGE FROM {} TEXT \"{}\" TIME #'.format(\n+ '-> MESSAGE FROM {} TEXT \"{}\" TIME %#%'.format(\nanswer.from_id,\nanswer.text.replace('\\n', ' ')\n))\n@@ -74,7 +74,7 @@ class EventProcessor(object):\nif key.match(answer.text) is not None:\nself._logger.debug(\n- '-> MESSAGE FROM CHAT {} TEXT \"{}\" TIME #'.format(\n+ '-> MESSAGE FROM CHAT {} TEXT \"{}\" TIME %#%'.format(\nanswer.peer_id,\nanswer.text.replace('\\n', ' ')\n))\n@@ -111,7 +111,7 @@ class EventProcessor(object):\naction = obj['action']\nself._logger.debug(\n- '-> ACTION FROM CHAT {} TYPE \"{}\" TIME #'.format(\n+ '-> ACTION FROM CHAT {} TYPE \"{}\" TIME %#%'.format(\nobj['peer_id'],\naction['type']\n))\n@@ -137,8 +137,8 @@ class EventProcessor(object):\n\"\"\"\nself._logger.debug(\n- '-> EVENT FROM {} TYPE \"{}\" TIME #'.format(\n- obj['from_id'],\n+ '-> EVENT FROM {} TYPE \"{}\" TIME %#%'.format(\n+ obj['user_id'] if 'user_id' in obj else 'from_id',\nevent_type.upper()\n)\n)\n@@ -152,7 +152,7 @@ class EventProcessor(object):\nself._logger.debug(\n'New event compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})'.format(\nevent_processor['call'].__name__,\n- data.from_id\n+ '*'\n)\n)\nreturn True\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -74,7 +74,7 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n- pattern, validators = vbml_parser(text)\n+ pattern, validators = vbml_parser(text, '{}$')\nself.inner[pattern] = dict(call=func, validators=validators)\nreturn func\n@@ -116,7 +116,7 @@ class MessageHandler:\n:return:\n\"\"\"\ndef decorator(func):\n- pattern, validators = vbml_parser(text, '(?i){}')\n+ pattern, validators = vbml_parser(text, '(?i){}$')\nself.inner[pattern] = dict(call=func, validators=validators)\nreturn func\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/regex.py",
"new_path": "vkbottle/handler/regex.py",
"diff": "@@ -8,17 +8,28 @@ def vbml_parser(text, f_pattern='{}'):\n:param f_pattern:\n:return:\n\"\"\"\n-\n+ # Make whole text re-invisible\nescape = {ord(x): '\\\\' + x for x in r'\\.*+?()[]|^$'}\n+\n+ # Find all arguments with validators\ntyped_arguments = re.findall(r'(<([a-zA-Z0-9_]+)+:.*?>)', text.translate(escape))\n- validators: dict = {}\n+ validation: dict = {}\n+ # Save validators of validated arguments\nfor p in typed_arguments:\n- validators[p[1]] = re.findall(r':([a-zA-Z0-9_]+)+', p[0])\n+ validators = re.findall(r':([a-zA-Z0-9_]+)+', p[0])\n+ validation[p[1]] = dict()\n+\n+ # Get arguments of validators\n+ for validator in validators:\n+ arguments = re.findall(':' + validator + r'\\\\\\[([a-zA-Z1-9|]+)+\\\\\\]', p[0])\n+ validation[p[1]][validator] = arguments\n+\n+ # Delete arguments from regex\ntext = re.sub(':.*?>', '>', text.translate(escape))\npattern = re.sub(r'(<.*?>)', r'(?P\\1.*)', text.translate(escape))\n- return re.compile(f_pattern.format(pattern)), validators\n+ return re.compile(f_pattern.format(pattern)), validation\ndef re_parser(pattern):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -19,7 +19,7 @@ class Coloring(object):\ndef __call__(self, text: str, color: str = 'white') -> colored:\nreturn '{prefix} {text}'.format(prefix=self.prefix,\n- text=colored(text.replace('#', time.strftime(\"%m-%d %H:%M:%S\", time.gmtime())), color))\n+ text=colored(text.replace('%#%', time.strftime(\"%m-%d %H:%M:%S\", time.gmtime())), color))\nclass Logger(object):\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 Val Arguments
with docs |
718,838 | 14.10.2019 21:49:20 | -10,800 | 4ba837ba3ee9798e6713c59ba483c0972695fc40 | v0.1 lil fixes
time in logger now local
validators docs are fixed | [
{
"change_type": "MODIFY",
"old_path": ".DS_Store",
"new_path": ".DS_Store",
"diff": "Binary files a/.DS_Store and b/.DS_Store differ\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -59,6 +59,7 @@ class Bot(HTTP, EventProcessor):\n:param longPollServer:\n:return: VK LongPoll Event\n\"\"\"\n+ try:\nurl = \"{}?act=a_check&key={}&ts={}&wait={}&rps_delay=0\".format(\nlongPollServer['server'],\nlongPollServer['key'],\n@@ -66,6 +67,9 @@ class Bot(HTTP, EventProcessor):\nself.__wait or DEFAULT_WAIT\n)\nreturn await self.request.post(url)\n+ except TimeoutError:\n+ self._logger.error('TimeoutError of asyncio in longpoll request')\n+ return await self.make_long_request(longPollServer)\ndef run_polling(self):\nloop = self.__loop\n@@ -117,7 +121,6 @@ class Bot(HTTP, EventProcessor):\nawait task\nelse:\n- print(obj)\nif -self.group_id not in obj.values():\n# If this is an event of the group AND this is not SELF-EVENT\ntask = ensure_future(self._event_processor(obj=obj, event_type=update['type']))\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -19,7 +19,7 @@ class Coloring(object):\ndef __call__(self, text: str, color: str = 'white') -> colored:\nreturn '{prefix} {text}'.format(prefix=self.prefix,\n- text=colored(text.replace('%#%', time.strftime(\"%m-%d %H:%M:%S\", time.gmtime())), color))\n+ text=colored(text.replace('%#%', time.strftime(\"%m-%d %H:%M:%S\", time.localtime())), color))\nclass Logger(object):\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.1 lil fixes
time in logger now local
validators docs are fixed |
718,838 | 15.10.2019 17:14:10 | -10,800 | 3e825c847550513e311cd4abcb5d572263b3f7fe | v0.2 fixes and features
+ bottle_examples
+ now you can separate args with , in validators
+ log fixes | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -46,6 +46,10 @@ class Bot(HTTP, EventProcessor):\ndef get_loop(self):\nreturn self.__loop\n+ @property\n+ def same(self):\n+ return self\n+\nasync def get_server(self) -> dict:\n\"\"\"\nGet an longPoll server for long request create\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/regex.py",
"new_path": "vkbottle/handler/regex.py",
"diff": "import re\n+from ..utils import flatten\ndef vbml_parser(text, f_pattern='{}'):\n@@ -30,7 +31,7 @@ def vbml_parser(text, f_pattern='{}'):\n# Get arguments of validators\nfor validator in validators:\n- arguments = [type_convert(a) for a in re.findall(':' + validator + r'\\\\\\[([a-zA-Z1-9|]+)+\\\\\\]', p[0])]\n+ arguments = [type_convert(a) for a in flatten([a.split(',') for a in re.findall(':' + validator + r'\\\\\\[(.+)+\\\\\\]', p[0])])]\nvalidation[p[1]][validator] = arguments\n# Delete arguments from regex\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/__init__.py",
"new_path": "vkbottle/utils/__init__.py",
"diff": "from .task import TaskQueue\n-from .tools import dict_of_dicts_merge\n+from .tools import dict_of_dicts_merge, flatten\nfrom .logger import Logger\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -36,22 +36,21 @@ class Logger(object):\nself.__level = level or logging.DEBUG\nself.logger = logging.getLogger(logger_name or 'VKBottle')\n- log_path = '{path}/{log_file}'.format(\n+ self.log_path = '{path}/{log_file}'.format(\npath=plugin_folder,\nlog_file=log_file if log_file and re.match(LOG_FILE_PATTERN, log_file) else DEFAULT_LOG_NAME)\nif logger_enabled:\n- open(log_path, 'w+').close()\n+ open(self.log_path, 'w+').close()\nself.logger.setLevel(self.__level)\nformatter = logging.Formatter(LOG_FORMAT)\n- handler = handlers.WatchedFileHandler(log_path)\n+ handler = handlers.WatchedFileHandler(self.log_path)\nhandler.setLevel(self.__level)\nhandler.setFormatter(formatter)\nself.logger.addHandler(handler)\n-\n- self.debug('My logging file path is {}'.format(log_path))\n+ self.debug('My logging file path is {}'.format(self.log_path))\ndef info(self, *some: Any):\nself.logger.info(*some)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/tools.py",
"new_path": "vkbottle/utils/tools.py",
"diff": "from collections import MutableMapping\n+from typing import Sequence\ndef dict_of_dicts_merge(d1, d2):\n@@ -14,3 +15,11 @@ def dict_of_dicts_merge(d1, d2):\nd3 = d1.copy()\nd3.update(d2)\nreturn d3\n+\n+\n+def flatten(lis):\n+ for item in lis:\n+ if isinstance(item, Sequence) and not isinstance(item, str):\n+ yield from flatten(item)\n+ else:\n+ yield item\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 fixes and features
+ bottle_examples
+ now you can separate args with , in validators
+ log fixes |
718,838 | 16.10.2019 14:55:14 | -10,800 | 95bdf5a735c54f62b3f50f3b99dee7ce794e18c9 | v0.2 Mailing addon | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "-from .framework import Bot\n+from .framework import Bot, Mailing\nfrom .types.message import Message\nfrom .utils.task import TaskQueue\nfrom .api.keyboard import keyboard_gen\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/exceptions.py",
"new_path": "vkbottle/api/exceptions.py",
"diff": "@@ -4,3 +4,7 @@ class VKError(Exception):\nclass FetchMethodError(Exception):\npass\n+\n+\n+class MailingAPIError(Exception):\n+ pass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/__init__.py",
"new_path": "vkbottle/framework/__init__.py",
"diff": "from .bot import Bot\n+from .mailing import Mailing\nfrom .patcher import VBMLValidators\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -125,7 +125,6 @@ class Bot(HTTP, EventProcessor):\nawait task\nelse:\n- if -self.group_id not in obj.values():\n# If this is an event of the group AND this is not SELF-EVENT\ntask = ensure_future(self._event_processor(obj=obj, event_type=update['type']))\nawait task\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/mailing.py",
"diff": "+from ..http import HTTP\n+from .bot import Bot\n+from ..api.exceptions import MailingAPIError\n+from ..utils import Logger\n+import json\n+\n+\n+MAILING_LOG_PARAMS = {'debug': True, 'log_file': 'mailing.log', 'plugin_folder': 'mailing'}\n+\n+\n+class Mailing(HTTP):\n+ def __init__(self,\n+ token: str,\n+ bot: Bot = None,\n+ access_token: str = None,\n+ debug: bool = False):\n+ self.__token = access_token or token\n+ self.api_url = 'https://broadcast.vkforms.ru/api/v2/broadcast'\n+ self._data = None\n+ self._logger = Logger(\n+ **(bot._logger.logger_params if bot else MAILING_LOG_PARAMS),\n+ prefix='Mailing', prefix_color='red')\n+\n+ def __call__(self,\n+ message: dict,\n+ list_ids: list = None,\n+ user_ids: list = None):\n+\n+ if not list_ids and not user_ids:\n+ raise MailingAPIError('You should match list_ids or user_ids')\n+\n+ self._data = dict(message=message)\n+ self._data['list_ids' if list_ids else 'user_ids'] = list_ids or user_ids\n+ self._logger.info('Added new mailing for', list_ids or user_ids)\n+\n+ def message(self, message: dict):\n+ self._data['message'] = message\n+\n+ async def run_now(self):\n+ if self._data:\n+ self._data['run_now'] = 1\n+ self._logger.debug('Mailing will be runned now!')\n+ return await self.request.post(f'{self.api_url}?token={self.__token}', json=self._data)\n+ else:\n+ raise MailingAPIError('Firstly add other params')\n+\n+ async def run_at(self, utc: str):\n+ if self._data:\n+ self._data['run_at'] = utc\n+ self._logger.debug('Mailing will be runned at', utc)\n+ return await self.request.post(f'{self.api_url}?token={self.__token}', json=self._data)\n+ else:\n+ raise MailingAPIError('Firstly add other params')\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/request.py",
"new_path": "vkbottle/http/request.py",
"diff": "@@ -28,18 +28,29 @@ class HTTPRequest(object):\nurl: str,\nparams: dict = None,\nclient: ClientSession = None,\n+ data: dict = None,\n+ json: dict = None,\ncontent_type: str = 'application/json'\n):\n- async with client.post(url, params=params or {}, ssl=ssl.SSLContext()) as response:\n+ async with client.post(url,\n+ params=params or {},\n+ ssl=ssl.SSLContext(),\n+ data=data or None,\n+ json=json or None) as response:\nreturn await response.json(content_type=content_type)\n@request\nasync def get(self,\nurl: str,\nclient: ClientSession = None,\n+ data: dict = None,\n+ json: dict = None,\ncontent_type: str = 'application/json'\n):\n- async with client.get(url, ssl=ssl.SSLContext()) as response:\n+ async with client.get(url,\n+ ssl=ssl.SSLContext(),\n+ data=data or None,\n+ json=json or None) as response:\nreturn await response.json(content_type=content_type)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -13,9 +13,9 @@ LOG_FORMAT = '[%(asctime)s %(name)s - %(levelname)s] - %(message)s'\nclass Coloring(object):\n- def __init__(self):\n+ def __init__(self, prefix: str = 'VKBottle', prefix_color: str = 'blue'):\ncolor_opt()\n- self.prefix = '[' + colored('VKBottle', 'blue') + ']'\n+ self.prefix = '[' + colored(prefix, prefix_color) + ']'\ndef __call__(self, text: str, color: str = 'white') -> colored:\nreturn '{prefix} {text}'.format(prefix=self.prefix,\n@@ -29,11 +29,17 @@ class Logger(object):\nplugin_folder: str,\nlevel=None,\nlogger_name: str = None,\n- logger_enabled: bool = True):\n+ logger_enabled: bool = True,\n+ prefix: str = 'VKBottle',\n+ prefix_color: str = 'blue'):\nself.__debug: bool = debug\n- self.__coloring = Coloring()\n+ self.__coloring = Coloring(prefix, prefix_color)\nself.__level = level or logging.DEBUG\n+ self.__log_file = log_file\n+ self.__plugin_folder = plugin_folder\n+ self.__logger_name = logger_name\n+ self.__logger_enabled = logger_enabled\nself.logger = logging.getLogger(logger_name or 'VKBottle')\nself.log_path = '{path}/{log_file}'.format(\n@@ -52,8 +58,19 @@ class Logger(object):\nself.logger.addHandler(handler)\nself.debug('My logging file path is {}'.format(self.log_path))\n+ @property\n+ def logger_params(self):\n+ return dict(\n+ debug=self.__debug,\n+ log_file=self.__log_file,\n+ plugin_folder=self.__plugin_folder,\n+ level=self.__level,\n+ logger_name=self.__logger_name,\n+ logger_enabled=self.__logger_enabled\n+ )\n+\ndef info(self, *some: Any):\n- self.logger.info(*some)\n+ self.logger.info(' '.join([str(i) for i in some]))\ndef debug(self, *some):\nself.logger.debug(*some)\n@@ -61,16 +78,16 @@ class Logger(object):\nprint(self.__coloring(' '.join([str(i) for i in some])))\ndef mark(self, *some):\n- self.logger.debug(*some)\n+ self.logger.debug(' '.join([str(i) for i in some]))\nif self.__debug:\nprint(self.__coloring(' '.join([str(i) for i in some]), 'grey'))\ndef warning(self, *some):\n- self.logger.debug(*some)\n+ self.logger.debug(' '.join([str(i) for i in some]))\nif self.__debug:\nprint(self.__coloring(' '.join([str(i) for i in some]), 'yellow'))\ndef error(self, *some):\n- self.logger.debug(*some)\n+ self.logger.debug(' '.join([str(i) for i in some]))\nif self.__debug:\nprint(self.__coloring(' '.join([str(i) for i in some]), 'red'))\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 Mailing addon |
718,838 | 19.10.2019 18:42:57 | -10,800 | 89b00c7de6cf064025b0792e12a69062f8ecc5e7 | v0.2 execute transparancy
fix execute method. now it can be called by:
bot.api.execute('my code on vk-script') | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -19,15 +19,20 @@ class Method(object):\nself._token = token\nself.request = request or HTTPRequest()\n- def generate_method_url(self, group, method):\n+ def generate_method_url(self, group, method, execute: bool = False):\nreturn API_URL + '{group}.{method}/?access_token={token}&v={version}'.format(\ngroup=group,\nmethod=method,\ntoken=self._token,\nversion=API_VERSION\n+ ) if not execute else API_URL + 'execute/?access_token={token}&v={version}'.format(\n+ group=group,\n+ method=method,\n+ token=self._token,\n+ version=API_VERSION\n)\n- async def __call__(self, group: str, method: str, params: dict = None):\n+ async def __call__(self, group: str, method: str, params: dict = None, execute: bool = False):\n\"\"\"\nVK API Method Wrapper\n:param group: method group\n@@ -35,7 +40,7 @@ class Method(object):\n:return: VK API Server Response\n\"\"\"\n- response = await self.request.post(url=self.generate_method_url(group, method), params=params)\n+ response = await self.request.post(url=self.generate_method_url(group, method, execute), params=params)\nif 'error' in response:\nraise VKError([\n@@ -90,6 +95,10 @@ class Api(object):\ndata = {k: v for k, v in data.items() if v is not None} if data else {}\nreturn await self.method_object(group, method, data)\n+ async def execute(self, code: str) -> dict:\n+ data = {'code': code}\n+ return await self.method_object('', '', data, execute=True)\n+\nasync def __call__(self, **kwargs) -> dict:\n\"\"\"\nAPI Method Maker\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/branch/branch.py",
"new_path": "vkbottle/framework/branch/branch.py",
"diff": "@@ -33,7 +33,6 @@ class BranchManager:\nif branch not in self._meet_up:\nraise BranchError('Branch \"{}\" is undefined'.format(branch))\nself._branch_queue[uid] = branch\n- print(self._branch_queue)\ndef load(self, uid: int) -> str:\nif uid in self._branch_queue:\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 execute transparancy
fix execute method. now it can be called by:
bot.api.execute('my code on vk-script') |
718,838 | 20.10.2019 11:06:10 | -10,800 | 03d9430344a6d04f478704d1fcf3a94ab9298a4a | v0.2 Handler Returnings
+ answer ignorable
+ auto-convertable types for answer | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/exceptions.py",
"new_path": "vkbottle/api/exceptions.py",
"diff": "@@ -12,3 +12,7 @@ class MailingAPIError(Exception):\nclass BranchError(Exception):\npass\n+\n+\n+class HandlerReturnError(Exception):\n+ pass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -3,7 +3,7 @@ from ..handler import Handler, ErrorHandler\nfrom ..const import DEFAULT_BOT_FOLDER\nfrom ..utils import Logger\nfrom ..http import HTTP\n-from ..api import VKError\n+from ..api import VKError, HandlerReturnError\nfrom asyncio import get_event_loop, AbstractEventLoop, ensure_future, TimeoutError\nfrom aiohttp.client_exceptions import ClientConnectionError, ServerTimeoutError\nfrom ._event import EventTypes\n@@ -134,12 +134,7 @@ class Bot(HTTP, EventProcessor):\ntask = ensure_future(self._chat_action_processor(obj=obj))\nprocessed = await task\n- if type(processed) == Branch:\n- self._logger.mark('[Branch Collected]', processed.branch_name)\n- self.branch.add(obj['peer_id'], processed.branch_name)\n- elif type(processed) == ExitBranch:\n- self._logger.mark('[Branch Exited]')\n- self.branch.exit(obj['peer_id'])\n+ ensure_future(self._handler_return(processed, obj))\nelse:\n# If this is an event of the group AND this is not SELF-EVENT\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "from ..types.message import Message\n-from ..api import Api\n+from ..api import Api, HandlerReturnError\nfrom ..handler import Handler\nfrom ..utils import Logger\nfrom .patcher import Patcher\nfrom .branch import BranchManager\nfrom asyncio import AbstractEventLoop, ensure_future\nfrom re import sub\n+from .branch import Branch, ExitBranch\nclass EventProcessor(object):\n@@ -44,7 +45,7 @@ class EventProcessor(object):\n# Added v0.19#master\ntask = await matching['call'](\n- answer,\n+ *([answer] if not matching['ignore_ans'] else []),\n**validators_check\n)\n@@ -93,7 +94,7 @@ class EventProcessor(object):\n# [Feature] Async Use\n# Added v0.19#master\ntask = await matching['call'](\n- answer,\n+ *([answer] if not matching['ignore_ans'] else []),\n**validators_check\n)\n@@ -188,3 +189,17 @@ class EventProcessor(object):\n)\n)\nreturn task\n+\n+ async def _handler_return(self, handler_return, obj: dict):\n+ return_type = type(handler_return)\n+ if return_type in [Branch, ExitBranch]:\n+ if return_type == Branch:\n+ self._logger.mark('[Branch Collected]', handler_return.branch_name)\n+ self.branch.add(obj['peer_id'], handler_return.branch_name)\n+ else:\n+ self._logger.mark('[Branch Exited]')\n+ self.branch.exit(obj['peer_id'])\n+ elif return_type in [str, int, dict, list, tuple]:\n+ await Message(**obj, api=[self.api])(str(handler_return))\n+ elif handler_return is not None:\n+ raise HandlerReturnError('Type {} can\\'t be returned out of handler'.format(type(handler_return).__name__))\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -2,6 +2,7 @@ from typing import Union\nfrom .regex import vbml_parser, re_parser\nfrom .events import Event\nfrom ..utils import dict_of_dicts_merge, Logger\n+from inspect import signature\nclass Handler(object):\n@@ -81,8 +82,9 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n+ ignore_ans = len(signature(func).parameters) < 1\npattern, validators = vbml_parser(text, '{}$', prefix=self.prefix if command else None)\n- self.inner[pattern] = dict(call=func, validators=validators)\n+ self.inner[pattern] = dict(call=func, validators=validators, ignore_ans=ignore_ans)\nreturn func\nreturn decorator\n@@ -99,8 +101,9 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n+ ignore_ans = len(signature(func).parameters) < 1\npattern, validators = vbml_parser(text, '{}.*?', prefix=self.prefix if command else None)\n- self.inner[pattern] = dict(call=func, validators=validators)\n+ self.inner[pattern] = dict(call=func, validators=validators, ignore_ans=ignore_ans)\nreturn func\nreturn decorator\n@@ -112,7 +115,8 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n- self.inner[re_parser(pattern)] = dict(call=func, validators={})\n+ ignore_ans = len(signature(func).parameters) < 1\n+ self.inner[re_parser(pattern)] = dict(call=func, validators={}, ignore_ans=ignore_ans)\nreturn func\nreturn decorator\n@@ -125,8 +129,9 @@ class MessageHandler:\n:return:\n\"\"\"\ndef decorator(func):\n+ ignore_ans = len(signature(func).parameters) < 1\npattern, validators = vbml_parser(text, '(?i){}$', prefix=self.prefix if command else None)\n- self.inner[pattern] = dict(call=func, validators=validators)\n+ self.inner[pattern] = dict(call=func, validators=validators, ignore_ans=ignore_ans)\nreturn func\nreturn decorator\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 Handler Returnings
+ answer ignorable
+ auto-convertable types for answer |
718,838 | 22.10.2019 15:50:08 | -10,800 | 329ce1dbef46a795144a908e96855634cc96b292 | comm abandoned | [
{
"change_type": "DELETE",
"old_path": "COMMERCIAL.md",
"new_path": null,
"diff": "-# VKBottle Commercial Recommendations\n-\n-Welcome to VKBottle! VKBottle is a useful client with useful facilities for working with VK. Be confident about it after using this test version. But we have an another version which contains more advantages for you:\n-\n-* Better Structure\n-\n-* :call_me_hand:Callback API\n-\n-* Full VK Api with specified objects\n-\n- * :man_technologist:Full Can-Be-Sended objects for advanced usage\n-\n- ```python\n- @bot.on.message.lower('plastify <material:usage>', validators=(validators.SafeMessage)}:\n- async def handler(ans: Message, material):\n- poll = Poll('Material {} is cool?'.format(material)).add(('yes', 'noh'))\n- ans('Wow it\\'s a poll!', poll, Photo(owner=1, id=327778612))\n- ```\n-\n-* :couple_with_heart_woman_man:Validators for arguments in messages and also messages\n-\n- * For arguments\n-\n- ```python\n- class CustomValidators(RegexValidators):\n- async def some_user(self, text):\n- matched = re.match(r'\\[id([\\d]+)\\|', text)\n- if matched:\n- return int(matched.group(1))\n- return\n-\n- @bot.on.message('id <uid:some_user>')\n- async def handler(ans: Message, uid):\n- ans(uid)\n- ```\n-\n- * For messages\n-\n- ```python\n- @bot.on.message.startswith('my opinion: <opinion>', validators=(validators.SafeMessage))\n- ```\n-\n-* VBML (VKBottle Matching Language) and Pure Regex support\n-\n- > pure regex:\n- >\n- > ```\n- > https?:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)\n- > ```\n-\n- > VBML:\n- >\n- > ```regex\n- > <:browserE(:https)>\n- > # or for vk.com\n- > <:browserE(:https:vk.com)>\n- > ```\n-\n-\n"
}
] | Python | MIT License | vkbottle/vkbottle | comm abandoned |
718,838 | 22.10.2019 18:01:14 | -10,800 | 001352d63532ca9ea7581c8f10bf31a94c704aff | v0.2 setup py | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "setup.py",
"diff": "+import setuptools\n+\n+with open('README.md', 'r') as f:\n+ long_description = f.read()\n+\n+setuptools.setup(\n+ name=\"vkbottle\",\n+ version=\"1.0\",\n+ author=\"timoniq\",\n+ description=\"Description..\",\n+ long_description=long_description,\n+ long_description_content_type=\"text/markdown\",\n+ url=\"https://github.com/timoniq/vkbottle\",\n+ packages=setuptools.find_packages(),\n+ classifiers=[\n+ \"Programming Language :: Python :: 3.5\",\n+ \"Programming Language :: Python :: 3.6\",\n+ \"Programming Language :: Python :: 3.7\",\n+ \"Operating System :: OS Independent\",\n+ ],\n+ install_requires=[\"aiohttp\", \"pydantic\", \"colorama\", \"termcolor\"],\n+)\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 setup py |
718,838 | 24.10.2019 17:52:52 | -10,800 | 364eda00e6b10c9b17b272d1d09ec76ca091141e | v0.2 fixed mention regexp | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -6,10 +6,11 @@ from .patcher import Patcher\nfrom .branch import BranchManager\nfrom asyncio import AbstractEventLoop, ensure_future\nfrom re import sub\n+from .regex import RegexHelper\nfrom .branch import Branch, ExitBranch\n-class EventProcessor(object):\n+class EventProcessor(RegexHelper):\napi: Api\non: Handler\npatcher: Patcher\n@@ -72,7 +73,7 @@ class EventProcessor(object):\n:param obj: VK API Event Object\n\"\"\"\n- answer = Message(**obj, api=[self.api])\n+ answer = Message(**{**obj, 'text': self.init_bot_mention(obj['text'])}, api=[self.api])\nfor key in self.on.chat_message.inner:\nif key.match(answer.text) is not None:\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/regex/__init__.py",
"diff": "+from .regex_addon import RegexHelper\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/regex/regex_addon.py",
"diff": "+import re\n+\n+\n+class RegexHelper(object):\n+ group_id: int\n+\n+ def init_bot_mention(self, text):\n+ pattern = r'^\\[club' + str(self.group_id) + r'\\|[@a-zA-Z0-9.]+\\] '\n+ return re.sub(pattern, '', text)\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 fixed mention regexp |
718,838 | 24.10.2019 20:59:00 | -10,800 | d9ccc90470ef64cbc55357dba5d16345a1f136c0 | v0.2.1 Important fix! | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -93,6 +93,7 @@ class EventProcessor(RegexHelper):\nif validators_check is not None:\n# [Feature] Async Use\n# Added v0.19#master\n+ print(matching)\ntask = await matching[\"call\"](\n*([answer] if not matching[\"ignore_ans\"] else []),\n**validators_check\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -132,7 +132,7 @@ class MessageHandler:\nprefix=self.prefix if command else None,\n)\nignore_ans = (\n- len([a for a in signature(func).parameters if a in arguments]) < 1\n+ len([a for a in signature(func).parameters if a not in arguments]) < 1\n)\nself.inner[pattern] = dict(\ncall=func, validators=validators, ignore_ans=ignore_ans\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2.1 Important fix! |
718,838 | 03.11.2019 09:01:51 | -10,800 | 6c79bb0542af32e6b64407dd8524a3ff931e71c9 | fix async poor code | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -102,7 +102,7 @@ class Bot(HTTP, EventProcessor):\nwhile True:\ntry:\nevent = await self.make_long_request(longPollServer)\n- ensure_future(self.emulate(event))\n+ await self.emulate(event)\nlongPollServer = await self.get_server()\nexcept ClientConnectionError or ServerTimeoutError or TimeoutError:\n@@ -138,31 +138,35 @@ class Bot(HTTP, EventProcessor):\nif update[\"type\"] == EventTypes.MESSAGE_NEW:\nif obj[\"peer_id\"] < 2e9:\nif obj[\"from_id\"] not in self.branch.queue:\n- task = ensure_future(\n+ task = await (\nself._private_message_processor(obj=obj)\n)\nelse:\n- task = ensure_future(self._branched_processor(obj=obj))\n+ task = await (\n+ self._branched_processor(obj=obj)\n+ )\nelse:\nif \"action\" not in obj:\nif obj[\"peer_id\"] not in self.branch.queue:\n- task = ensure_future(\n+ task = await (\nself._chat_message_processor(obj=obj)\n)\nelse:\n- task = ensure_future(self._branched_processor(obj=obj))\n+ task = await (\n+ self._branched_processor(obj=obj)\n+ )\nelse:\n- task = ensure_future(self._chat_action_processor(obj=obj))\n+ task = await (\n+ self._chat_action_processor(obj=obj)\n+ )\n- processed = await task\n- ensure_future(self._handler_return(processed, obj))\n+ await self._handler_return(task, obj)\nelse:\n# If this is an event of the group AND this is not SELF-EVENT\ntask = ensure_future(\nself._event_processor(obj=obj, event_type=update[\"type\"])\n)\n- await task\nexcept VKError as e:\ne = list(e.args)[0]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -93,7 +93,6 @@ class EventProcessor(RegexHelper):\nif validators_check is not None:\n# [Feature] Async Use\n# Added v0.19#master\n- print(matching)\ntask = await matching[\"call\"](\n*([answer] if not matching[\"ignore_ans\"] else []),\n**validators_check\n"
}
] | Python | MIT License | vkbottle/vkbottle | fix async poor code |
718,838 | 03.11.2019 09:15:07 | -10,800 | aabd086c4de526d9fcc39d370a6af8bc72854bfe | v0.2b Change current version and fix dispatch | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "-__version__ = \"0.2a\" # Package VKBottle version\n+__version__ = \"0.2b\" # Package VKBottle version\n__author__ = \"Arseniy Timonik\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -112,17 +112,7 @@ class Bot(HTTP, EventProcessor):\nasync def emulate(self, event: dict, confirmation_token: str = None):\nif not self.__dispatched:\n- # Check updates from timoniq/vkbottle-rest\n- current_rest = await self.get_current_rest()\n- if current_rest[\"version\"] != __version__:\n- self._logger.mark(\n- \"You are using old version of VKBottle. Update is found: {}\".format(\n- current_rest[\"version\"]\n- ),\n- current_rest[\"description\"],\n- )\n-\n- self.on.dispatch()\n+ await self.on.dispatch(self.get_current_rest)\nself.__dispatched = True\nif \"type\" in event and event[\"type\"] == \"confirmation\":\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "-from typing import Union\nfrom .regex import vbml_parser, re_parser\nfrom .events import Event\nfrom ..utils import dict_of_dicts_merge, Logger\nfrom inspect import signature\n+from typing import Callable\n+from ..const import __version__\nclass Handler(object):\ndef __init__(self, logger: Logger, group_id: int = 0):\nself.__group_id: int = group_id\n+ self.__logger = logger\nself.message: MessageHandler = MessageHandler()\nself.chat_message: MessageHandler = MessageHandler()\n@@ -17,13 +19,22 @@ class Handler(object):\nself.event: Event = Event()\nself.__chat_action_types: dict = dict()\n- def dispatch(self):\n+ async def dispatch(self, get_current_rest: Callable):\nself.message.inner = dict_of_dicts_merge(\nself.message.inner, self.message_both.inner\n)\nself.chat_message.inner = dict_of_dicts_merge(\nself.chat_message.inner, self.message_both.inner\n)\n+ # Check updates from timoniq/vkbottle-rest\n+ current_rest = await get_current_rest()\n+ if current_rest[\"version\"] != __version__:\n+ self.__logger.mark(\n+ \"You are using old version of VKBottle. Update is found: {}\".format(\n+ current_rest[\"version\"]\n+ ),\n+ current_rest[\"description\"],\n+ )\ndef change_prefix_for_all(self, prefix: list):\nself.message.prefix = prefix\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2b Change current version and fix dispatch |
718,838 | 03.11.2019 11:02:55 | -10,800 | 16fbeaeb5fd7e8239ef4ab449b51d54543109cb2 | v0.2b Branch docs | [
{
"change_type": "ADD",
"old_path": "docs/emulation.scheme.png",
"new_path": "docs/emulation.scheme.png",
"diff": "Binary files /dev/null and b/docs/emulation.scheme.png differ\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2b Branch docs |
718,838 | 03.11.2019 11:17:07 | -10,800 | 166fa0afab7cd51dd5b90409a48c26f73307654d | v0.2b Api Update to 5.103 | [
{
"change_type": "MODIFY",
"old_path": "portable/PORTABLE.json",
"new_path": "portable/PORTABLE.json",
"diff": "{\n- \"version\": \"0.15\",\n+ \"version\": \"timoniq/vkbottle-rest\",\n\"license\": \"GPL-3.0\",\n\"author\": \"Arseniy Timonik\"\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/exceptions.py",
"new_path": "vkbottle/api/exceptions.py",
"diff": "@@ -14,5 +14,9 @@ class BranchError(Exception):\npass\n-class HandlerReturnError(Exception):\n+class HandlerError(Exception):\n+ pass\n+\n+\n+class HandlerReturnError(HandlerError):\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/keyboard/generator.py",
"new_path": "vkbottle/api/keyboard/generator.py",
"diff": "@@ -6,7 +6,7 @@ except ImportError:\nimport json\n-def keyboard_gen(pattern: List[List[Dict]], one_time: bool = True):\n+def keyboard_gen(pattern: List[List[Dict]], one_time: bool = False, inline: bool = False):\n\"\"\"Simple keyboard constructor\n:param pattern: Keyboard simple pattern, check github readme\n:param one_time: Should keyboard be hidden after first use?\n@@ -32,7 +32,7 @@ def keyboard_gen(pattern: List[List[Dict]], one_time: bool = True):\nbuttons.append(row_buttons)\nkeyboard = str(\n- json.dumps(dict(one_time=one_time, buttons=buttons), ensure_ascii=False)\n+ json.dumps(dict(one_time=one_time, buttons=buttons, inline=inline), ensure_ascii=False)\n.encode(\"utf-8\")\n.decode(\"utf-8\")\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "@@ -2,7 +2,7 @@ __version__ = \"0.2b\" # Package VKBottle version\n__author__ = \"Arseniy Timonik\"\n-API_VERSION = 5.102 # VK Api version\n+API_VERSION = 5.103 # VK Api version\nAPI_URL = \"https://api.vk.com/method/\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -111,7 +111,6 @@ class Bot(HTTP, EventProcessor):\nasync def emulate(self, event: dict, confirmation_token: str = None):\nif not self.__dispatched:\n-\nawait self.on.dispatch(self.get_current_rest)\nself.__dispatched = True\n@@ -126,31 +125,36 @@ class Bot(HTTP, EventProcessor):\nobj = update[\"object\"]\nif update[\"type\"] == EventTypes.MESSAGE_NEW:\n+\n+ # VK API v5.103\n+ client_info = obj['client_info']\n+ obj = obj['message']\n+\nif obj[\"peer_id\"] < 2e9:\nif obj[\"from_id\"] not in self.branch.queue:\ntask = await (\n- self._private_message_processor(obj=obj)\n+ self._private_message_processor(obj=obj, client_info=client_info)\n)\nelse:\ntask = await (\n- self._branched_processor(obj=obj)\n+ self._branched_processor(obj=obj, client_info=client_info)\n)\nelse:\nif \"action\" not in obj:\nif obj[\"peer_id\"] not in self.branch.queue:\ntask = await (\n- self._chat_message_processor(obj=obj)\n+ self._chat_message_processor(obj=obj, client_info=client_info)\n)\nelse:\ntask = await (\n- self._branched_processor(obj=obj)\n+ self._branched_processor(obj=obj, client_info=client_info)\n)\nelse:\ntask = await (\nself._chat_action_processor(obj=obj)\n)\n- await self._handler_return(task, obj)\n+ await self._handler_return(task, obj, client_info=client_info)\nelse:\n# If this is an event of the group AND this is not SELF-EVENT\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -19,13 +19,13 @@ class EventProcessor(RegexHelper):\n_logger: Logger\n__loop: AbstractEventLoop\n- async def _private_message_processor(self, obj: dict):\n+ async def _private_message_processor(self, obj: dict, client_info: dict):\n\"\"\"\nPrivate message processor. Using regex to process regular expressions in messages\n:param obj: VK API Event Object\n\"\"\"\n- answer = Message(**obj, api=[self.api])\n+ answer = Message(**obj, api=[self.api], client_info=client_info)\nself._logger.debug(\n'-> MESSAGE FROM {} TEXT \"{}\" TIME %#%'.format(\n@@ -58,7 +58,7 @@ class EventProcessor(RegexHelper):\nreturn task\nif self.on.undefined_func:\n- ensure_future(self.on.undefined_func(answer))\n+ await (self.on.undefined_func(answer))\nself._logger.debug(\n\"New message compiled with decorator <\\x1b[35mon-message-undefined\\x1b[0m> (from: {})\".format(\nanswer.from_id\n@@ -67,13 +67,17 @@ class EventProcessor(RegexHelper):\nelse:\nself._logger.info(\"Add on-undefined message handler!\")\n- async def _chat_message_processor(self, obj: dict):\n+ async def _chat_message_processor(self, obj: dict, client_info: dict):\n\"\"\"\nChat messages processor. Using regex to process regular expressions in messages\n:param obj: VK API Event Object\n\"\"\"\n- answer = Message(**{**obj, 'text': self.init_bot_mention(obj['text'])}, api=[self.api])\n+ answer = Message(\n+ **{**obj, 'text': self.init_bot_mention(obj['text'])},\n+ api=[self.api],\n+ client_info=client_info\n+ )\nfor key in self.on.chat_message.inner:\nif key.match(answer.text) is not None:\n@@ -162,14 +166,14 @@ class EventProcessor(RegexHelper):\n)\nreturn True\n- async def _branched_processor(self, obj: dict):\n+ async def _branched_processor(self, obj: dict, client_info: dict):\n\"\"\"\nBranched messages processor manager\n:param obj: VK Server Event Object\n\"\"\"\nobj[\"text\"] = sub(r\"\\[club\" + str(self.group_id) + r\"\\|.*?\\] \", \"\", obj[\"text\"])\n- answer = Message(**obj, api=[self.api])\n+ answer = Message(**obj, api=[self.api], client_info=client_info)\nself._logger.debug(\n'-> BRANCHED MESSAGE FROM {} TEXT \"{}\" TIME %#%'.format(\n@@ -189,7 +193,7 @@ class EventProcessor(RegexHelper):\n)\nreturn task\n- async def _handler_return(self, handler_return, obj: dict):\n+ async def _handler_return(self, handler_return, obj: dict, client_info: dict):\n\"\"\"\nAllows use returns in handlers and operates them\n:param handler_return:\n@@ -209,7 +213,7 @@ class EventProcessor(RegexHelper):\nself._logger.mark(\"[Branch Exited]\")\nself.branch.exit(obj[\"peer_id\"])\nelif return_type in [str, int, dict, list, tuple]:\n- await Message(**obj, api=[self.api])(str(handler_return))\n+ await Message(**obj, api=[self.api], client_info=client_info)(str(handler_return))\nelif handler_return is not None:\nraise HandlerReturnError(\n\"Type {} can't be returned out of handler\".format(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -4,10 +4,22 @@ from ..utils import dict_of_dicts_merge, Logger\nfrom inspect import signature\nfrom typing import Callable\nfrom ..const import __version__\n+from inspect import iscoroutinefunction\n+from ..api import HandlerError\n+\n+\n+def should_ignore_ans(func: Callable, arguments: list) -> bool:\n+ if not iscoroutinefunction(func):\n+ raise HandlerError('Handling function must be async')\n+ return len([a for a in signature(func).parameters if a not in arguments]) < 1\nclass Handler(object):\n- def __init__(self, logger: Logger, group_id: int = 0):\n+ def __init__(\n+ self,\n+ logger: Logger,\n+ group_id: int = 0\n+ ):\nself.__group_id: int = group_id\nself.__logger = logger\n@@ -19,7 +31,10 @@ class Handler(object):\nself.event: Event = Event()\nself.__chat_action_types: dict = dict()\n- async def dispatch(self, get_current_rest: Callable):\n+ async def dispatch(\n+ self,\n+ get_current_rest: Callable\n+ ) -> None:\nself.message.inner = dict_of_dicts_merge(\nself.message.inner, self.message_both.inner\n)\n@@ -36,12 +51,18 @@ class Handler(object):\ncurrent_rest[\"description\"],\n)\n- def change_prefix_for_all(self, prefix: list):\n+ def change_prefix_for_all(\n+ self,\n+ prefix: list\n+ ) -> None:\nself.message.prefix = prefix\nself.chat_message.prefix = prefix\nself.message_both.prefix = prefix\n- def chat_action(self, type_: str, rules: dict = None):\n+ def chat_action(\n+ self, type_: str,\n+ rules: dict = None\n+ ):\n\"\"\"\nSpecial express processor of chat actions (https://vk.com/dev/objects/message - action object)\n:param type_: action name\n@@ -100,7 +121,41 @@ class MessageHandler:\nself.inner = dict()\nself.prefix: list = [\"/\", \"!\"]\n- def __call__(self, text: str, command: bool = False, lower: bool = False):\n+ def add_handler(\n+ self,\n+ text: str,\n+ func: Callable,\n+ command: bool = False,\n+ lower: bool = False,\n+ pattern: str = None\n+ ):\n+ \"\"\"\n+ Add handler to dispatcher without decorators\n+ :param text: text (match case)\n+ :param func: function responsible for event\n+ :param command: Is this is a /command\n+ :param lower: Should IGNORECASE param for regex be used\n+ :param pattern: any regex pattern pattern. {} means text which will be formatted\n+ :return: True\n+ \"\"\"\n+\n+ pattern, validators, arguments = vbml_parser(\n+ text,\n+ pattern or (\"(?i)\" if lower else \"\") + \"{}$\",\n+ prefix=self.prefix if command else None,\n+ )\n+ self.inner[pattern] = dict(\n+ call=func,\n+ validators=validators,\n+ ignore_ans=should_ignore_ans(func, arguments)\n+ )\n+\n+ def __call__(\n+ self,\n+ text: str,\n+ command: bool = False,\n+ lower: bool = False\n+ ):\n\"\"\"\nSimple on.message(text) decorator. Support regex keys in text\n:param text: text (match case)\n@@ -114,17 +169,21 @@ class MessageHandler:\n(\"(?i)\" if lower else \"\") + \"{}$\",\nprefix=self.prefix if command else None,\n)\n- ignore_ans = (\n- len([a for a in signature(func).parameters if a not in arguments]) < 1\n- )\nself.inner[pattern] = dict(\n- call=func, validators=validators, ignore_ans=ignore_ans\n+ call=func,\n+ validators=validators,\n+ ignore_ans=should_ignore_ans(func, arguments)\n)\nreturn func\nreturn decorator\n- def startswith(self, text: str, command=False, lower: bool = False):\n+ def startswith(\n+ self,\n+ text: str,\n+ command: bool = False,\n+ lower: bool = False\n+ ):\n\"\"\"\nStartswith regex message processor\n@@ -142,26 +201,29 @@ class MessageHandler:\n(\"(?i)\" if lower else \"\") + \"{}.*?\",\nprefix=self.prefix if command else None,\n)\n- ignore_ans = (\n- len([a for a in signature(func).parameters if a not in arguments]) < 1\n- )\nself.inner[pattern] = dict(\n- call=func, validators=validators, ignore_ans=ignore_ans\n+ call=func,\n+ validators=validators,\n+ ignore_ans=should_ignore_ans(func, arguments)\n)\nreturn func\nreturn decorator\n- def regex(self, pattern: str):\n+ def regex(\n+ self,\n+ pattern: str\n+ ):\n\"\"\"\nRegex message compiler\n:param pattern: Regex string\n\"\"\"\ndef decorator(func):\n- ignore_ans = len(signature(func).parameters) < 1\nself.inner[re_parser(pattern)] = dict(\n- call=func, validators={}, ignore_ans=ignore_ans\n+ call=func,\n+ validators={},\n+ ignore_ans=should_ignore_ans(func, [])\n)\nreturn func\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -36,6 +36,12 @@ class MessageAction(BaseModel):\nphoto: MessageActionPhoto = None\n+class ClientInfo(BaseModel):\n+ button_actions: list = None\n+ keyboard: bool = None\n+ lang_id: int = None\n+\n+\nclass Message(BaseModel):\nid: int = None\ndate: int = None\n@@ -51,6 +57,7 @@ class Message(BaseModel):\nfwd_messages: typing.List[\"Message\"] = []\nreply_message: \"Message\" = None\napi: list = None\n+ client_info: \"ClientInfo\" = None\nasync def reply(\nself,\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2b Api Update to 5.103 |
718,838 | 03.11.2019 21:51:20 | -10,800 | 96c0f84852afb24c4223fdf6d8a3b8439b956506 | v0.2b Regex update
+ arguments fix (lazy separators)
+ patcher update
+ float is handler returnable type
+ new exception-types | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/exceptions.py",
"new_path": "vkbottle/api/exceptions.py",
"diff": "@@ -20,3 +20,7 @@ class HandlerError(Exception):\nclass HandlerReturnError(HandlerError):\npass\n+\n+\n+class VBMLError(Exception):\n+ pass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/patcher/patcher.py",
"new_path": "vkbottle/framework/patcher/patcher.py",
"diff": "@@ -3,6 +3,7 @@ from .validators import VBMLValidators\nfrom inspect import getmembers, ismethod\nfrom typing import Optional, ClassVar\nfrom ...utils import folder_checkup\n+from ...api import VBMLError\nclass Patcher(WhiteList):\n@@ -27,9 +28,12 @@ class Patcher(WhiteList):\n**validators_kwargs\n):\nif validators:\n+ if issubclass(validators, VBMLValidators):\nself.regex_validators = self.__provide_validators(\nvalidators, validators_kwargs\n)\n+ else:\n+ raise VBMLError('Custom validators cls should inherit VBMLValidators cls')\nif disable_validators:\nself.disable_validators = True\n@@ -59,7 +63,7 @@ class Patcher(WhiteList):\nelse:\nvalid_dict[key] = k\nelse:\n- valid_dict = keys\n+ valid_dict[key] = keys[key]\nreturn valid_dict\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -212,7 +212,7 @@ class EventProcessor(RegexHelper):\nelse:\nself._logger.mark(\"[Branch Exited]\")\nself.branch.exit(obj[\"peer_id\"])\n- elif return_type in [str, int, dict, list, tuple]:\n+ elif return_type in [str, int, dict, list, tuple, float]:\nawait Message(**obj, api=[self.api], client_info=client_info)(str(handler_return))\nelif handler_return is not None:\nraise HandlerReturnError(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -33,7 +33,7 @@ class Handler(object):\nasync def dispatch(\nself,\n- get_current_rest: Callable\n+ get_current_rest: Callable = None\n) -> None:\nself.message.inner = dict_of_dicts_merge(\nself.message.inner, self.message_both.inner\n@@ -41,6 +41,7 @@ class Handler(object):\nself.chat_message.inner = dict_of_dicts_merge(\nself.chat_message.inner, self.message_both.inner\n)\n+ if get_current_rest:\n# Check updates from timoniq/vkbottle-rest\ncurrent_rest = await get_current_rest()\nif current_rest[\"version\"] != __version__:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/regex.py",
"new_path": "vkbottle/handler/regex.py",
"diff": "@@ -46,7 +46,7 @@ def vbml_parser(text, f_pattern: str = \"{}\", prefix: list = None):\n# Delete arguments from regex\ntext = re.sub(\":.*?>\", \">\", text.translate(escape))\n- pattern = re.sub(r\"(<.*?>)\", r\"(?P\\1.*)\", text.translate(escape))\n+ pattern = re.sub(r\"(<.*?>)\", r\"(?P\\1.*?)\", text.translate(escape))\nreturn (\nre.compile(re.compile(prefix).pattern + f_pattern.format(pattern)),\nvalidation,\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2b Regex update
+ arguments fix (lazy separators)
+ patcher update
+ float is handler returnable type
+ new exception-types |
718,838 | 04.11.2019 13:03:15 | -10,800 | 966be85a93b69d2cc4933c9d8d0131896303cf08 | v0.2b Fix actions and regex fix | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -121,24 +121,21 @@ class EventProcessor(RegexHelper):\nself._logger.debug(\n'-> ACTION FROM CHAT {} TYPE \"{}\" TIME %#%'.format(\nobj[\"peer_id\"], action[\"type\"]\n- )\n- )\n+ ))\n- if action[\"type\"] in self.on.chat_action_types:\n- if {\n- **action,\n- **self.on.chat_action_types[action[\"type\"]][\"rules\"],\n- } == action:\n+ for key in self.on.chat_action_types:\n+ rules = {**action, **key[\"rules\"]}\n+ if action[\"type\"] == key[\"name\"] and rules == action:\nanswer = Message(**obj, api=[self.api])\n- await self.on.chat_action_types[action[\"type\"]][\"call\"](answer)\n+ await key[\"call\"](answer)\nself._logger.debug(\n\"New action compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})\".format(\n- self.on.chat_action_types[action[\"type\"]][\"call\"].__name__,\n+ key[\"call\"].__name__,\nanswer.from_id,\n- )\n- )\n+ ))\n+ break\nasync def _event_processor(self, obj: dict, event_type: str):\n\"\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/regex/regex_addon.py",
"new_path": "vkbottle/framework/regex/regex_addon.py",
"diff": "@@ -5,5 +5,5 @@ class RegexHelper(object):\ngroup_id: int\ndef init_bot_mention(self, text):\n- pattern = r'^\\[club' + str(self.group_id) + r'\\|[@a-zA-Z0-9.]+\\] '\n+ pattern = r'^\\[club' + str(self.group_id) + r'\\|[@a-zA-Z0-9.]+\\][\\,]{0,1} '\nreturn re.sub(pattern, '', text)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -29,12 +29,13 @@ class Handler(object):\nself.__undefined_message_func = None\nself.event: Event = Event()\n- self.__chat_action_types: dict = dict()\n+ self.__chat_action_types: list = list()\nasync def dispatch(\nself,\nget_current_rest: Callable = None\n) -> None:\n+\nself.message.inner = dict_of_dicts_merge(\nself.message.inner, self.message_both.inner\n)\n@@ -42,6 +43,7 @@ class Handler(object):\nself.chat_message.inner, self.message_both.inner\n)\nif get_current_rest:\n+\n# Check updates from timoniq/vkbottle-rest\ncurrent_rest = await get_current_rest()\nif current_rest[\"version\"] != __version__:\n@@ -71,7 +73,7 @@ class Handler(object):\n\"\"\"\ndef decorator(func):\n- self.__chat_action_types[type_] = {\"call\": func, \"rules\": rules or {}}\n+ self.__chat_action_types.append({'name': type_, \"call\": func, \"rules\": rules or {}})\nreturn func\nreturn decorator\n@@ -100,10 +102,11 @@ class Handler(object):\ndef chat_invite(self):\ndef decorator(func):\n- self.__chat_action_types[\"chat_invite_user\"] = {\n+ self.__chat_action_types.append({\n+ \"name\": \"chat_invite_user\",\n\"call\": func,\n\"rules\": {\"member_id\": -self.__group_id},\n- }\n+ })\nreturn func\nreturn decorator\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2b Fix actions and regex fix |
718,838 | 04.11.2019 18:45:10 | -10,800 | 437f7385167ef8f92a3fd8366fa86e04a9295c29 | v0.2b Delaying request debug when VK falls down | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -2,6 +2,9 @@ from ..const import API_VERSION, API_URL\nfrom .exceptions import VKError\nfrom ..http import HTTPRequest\nfrom asyncio import AbstractEventLoop, get_event_loop\n+import time\n+import asyncio\n+from termcolor import cprint\nclass Method(object):\n@@ -19,6 +22,7 @@ class Method(object):\n:param request: aioHTTP ClientSession for ordered sessions\n\"\"\"\nself.loop = loop\n+ self.__delay = 1\nself._token = token\nself.request = request or HTTPRequest()\n@@ -48,6 +52,7 @@ class Method(object):\nresponse = await self.request.post(\nurl=self.generate_method_url(group, method, _execute), params=params\n)\n+ try:\nif \"error\" in response:\nraise VKError(\n@@ -55,6 +60,16 @@ class Method(object):\n)\nreturn response[\"response\"]\n+ except Exception as e:\n+ cprint(f\"\"\"\n+--- {time.strftime(\"%m-%d %H:%M:%S\", time.localtime())} - DELAY {self.__delay*5} sec\n+Check your internet connection. Maybe VK died, request returned: {e}\n+Error appeared after request: {group}.{method} (execute: {_execute})\n+Sent params: {params}\"\"\", 'yellow')\n+ await asyncio.sleep(5*self.__delay)\n+ self.__delay += 1\n+ return await self(group, method, params, _execute)\n+\nclass Api(object):\n\"\"\"\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2b Delaying request debug when VK falls down |
718,838 | 04.11.2019 19:03:43 | -10,800 | c192a28574cc347a76adc4b8bcffbd0c1ba95fc0 | v0.2b Event fix + Event message_typing_state | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/events.py",
"new_path": "vkbottle/handler/events.py",
"diff": "@@ -31,6 +31,13 @@ class Event(object):\nreturn decorator\n+ def message_typing_state(self):\n+ def decorator(func):\n+ self.events[EventList.MESSAGE_TYPING_STATE] = {\"call\": func, \"data\": MessageTypingState}\n+ return func\n+\n+ return decorator\n+\ndef photo_new(self):\ndef decorator(func):\nself.events[EventList.PHOTO_NEW] = {\"call\": func, \"data\": Photo}\n@@ -269,7 +276,7 @@ class Event(object):\ndef group_leave(self):\ndef decorator(func):\n- self.events[EventList.GROUP_JOIN] = {\"call\": func, \"data\": GroupLeave}\n+ self.events[EventList.GROUP_LEAVE] = {\"call\": func, \"data\": GroupLeave}\nreturn func\nreturn decorator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/community/events_list.py",
"new_path": "vkbottle/types/events/community/events_list.py",
"diff": "@@ -6,6 +6,7 @@ class EventList(str, Enum):\nMESSAGE_REPLY = \"message_reply\"\nMESSAGE_ALLOW = \"message_allow\"\nMESSAGE_DENY = \"message_deny\"\n+ MESSAGE_TYPING_STATE = \"message_typing_state\"\nPHOTO_NEW = \"photo_new\"\nPHOTO_COMMENT_NEW = \"photo_comment_new\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/community/events_objects.py",
"new_path": "vkbottle/types/events/community/events_objects.py",
"diff": "@@ -39,6 +39,33 @@ class MessageAllow(BaseModel):\n)\n+class MessageTypingState(BaseModel):\n+ state: str = None\n+ from_id: int = None\n+ to_id: int = None\n+ api: list = None\n+\n+ async def __call__(\n+ self,\n+ message: str = None,\n+ attachment: str = None,\n+ keyboard: dict = None,\n+ **params\n+ ):\n+ return await self.api[0].request(\n+ \"messages\",\n+ \"send\",\n+ dict(\n+ message=message,\n+ peer_id=self.from_id,\n+ attachment=attachment,\n+ keyboard=keyboard,\n+ random_id=random.randint(-2e9, 2e9),\n+ **params\n+ ),\n+ )\n+\n+\nclass MessageDeny(BaseModel):\nuser_id: int = None\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2b Event fix + Event message_typing_state |
718,838 | 04.11.2019 20:31:08 | -10,800 | 6495c7fc30e1d379f3729b4a0c3359153d6a7920 | v0.2b Minor but important | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -52,24 +52,25 @@ class Method(object):\nresponse = await self.request.post(\nurl=self.generate_method_url(group, method, _execute), params=params\n)\n- try:\n- if \"error\" in response:\n- raise VKError(\n- [response[\"error\"][\"error_code\"], response[\"error\"][\"error_msg\"]]\n- )\n- return response[\"response\"]\n+ if type(response) is not dict:\n- except Exception as e:\ncprint(f\"\"\"\n--- {time.strftime(\"%m-%d %H:%M:%S\", time.localtime())} - DELAY {self.__delay*5} sec\nCheck your internet connection. Maybe VK died, request returned: {e}\nError appeared after request: {group}.{method} (execute: {_execute})\nSent params: {params}\"\"\", 'yellow')\n+\nawait asyncio.sleep(5*self.__delay)\nself.__delay += 1\nreturn await self(group, method, params, _execute)\n+ if \"error\" in response:\n+ raise VKError(\n+ [response[\"error\"][\"error_code\"], response[\"error\"][\"error_msg\"]]\n+ )\n+ return response[\"response\"]\n+\nclass Api(object):\n\"\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/events/community/event.py",
"new_path": "vkbottle/types/events/community/event.py",
"diff": "from enum import Enum\nfrom ...base import BaseModel\n-from .events_list import Event as events\n+from .events_list import EventList as events\nfrom . import events_objects as EventsObjects\nfrom ...message import Message\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2b Minor but important |
718,838 | 04.11.2019 20:56:17 | -10,800 | 914a145c659d7c6ee9b800970826306d12afcc76 | v0.2 Full version, last fix | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -57,7 +57,7 @@ class Method(object):\ncprint(f\"\"\"\n--- {time.strftime(\"%m-%d %H:%M:%S\", time.localtime())} - DELAY {self.__delay*5} sec\n-Check your internet connection. Maybe VK died, request returned: {e}\n+Check your internet connection. Maybe VK died, request returned: {response}\nError appeared after request: {group}.{method} (execute: {_execute})\nSent params: {params}\"\"\", 'yellow')\n@@ -69,6 +69,14 @@ Sent params: {params}\"\"\", 'yellow')\nraise VKError(\n[response[\"error\"][\"error_code\"], response[\"error\"][\"error_msg\"]]\n)\n+\n+ if self.__delay > 1:\n+\n+ cprint(f\"\"\"\n+--- {time.strftime(\"%m-%d %H:%M:%S\", time.localtime())} - METHOD SUCCESS after {5*sum(range(1, self.__delay))} sec\n+RESPONSE: {response}\"\"\", color='green')\n+ self.__delay = 1\n+\nreturn response[\"response\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "-__version__ = \"0.2b\" # Package VKBottle version\n+__version__ = \"0.2\" # Package VKBottle version\n__author__ = \"Arseniy Timonik\"\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 Full version, last fix |
718,838 | 05.11.2019 18:11:25 | -10,800 | 046c57c82632d9a412e83bb4e5be70fa6691d47a | v0.2 Examples Fix | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -103,6 +103,7 @@ class Bot(HTTP, EventProcessor):\nwhile True:\ntry:\nevent = await self.make_long_request(longPollServer)\n+ if type(event) is dict:\nawait self.emulate(event)\nlongPollServer = await self.get_server()\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 Examples Fix |
718,838 | 06.11.2019 18:19:25 | -10,800 | abad3d96dd03bbb65c843437d5cb9046c3612e3f | v0.2 Poor code fix | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -54,13 +54,9 @@ class Bot(HTTP, EventProcessor):\nreturn self.__group_id\n@property\n- def get_loop(self):\n+ def loop(self):\nreturn self.__loop\n- @property\n- def same(self):\n- return self\n-\nasync def get_server(self) -> dict:\n\"\"\"\nGet an longPoll server for long request create\n@@ -95,7 +91,7 @@ class Bot(HTTP, EventProcessor):\nasync def _run_polling(self, wait: int = DEFAULT_WAIT):\nself.__wait = wait\n- self._logger.info(\"LongPoll will run. Is it OK?\")\n+ self._logger.info(\"Polling will be started. Is it OK?\")\nlongPollServer = await self.get_server()\nself._logger.debug('Polling successfully started')\n@@ -103,7 +99,7 @@ class Bot(HTTP, EventProcessor):\nwhile True:\ntry:\nevent = await self.make_long_request(longPollServer)\n- if type(event) is dict:\n+ if isinstance(event, dict):\nawait self.emulate(event)\nlongPollServer = await self.get_server()\n@@ -111,16 +107,24 @@ class Bot(HTTP, EventProcessor):\n# No internet connection\nawait self._logger.warning(\"Server Timeout Error!\")\n- async def emulate(self, event: dict, confirmation_token: str = None):\n+ async def emulate(self, event: dict, confirmation_token: str = None) -> str:\n+ \"\"\"\n+ Process all types of events\n+ :param event: VK Event (LP or CB)\n+ :param confirmation_token: code which confirm VK callback\n+ :return: \"ok\"\n+ \"\"\"\n+\nif not self.__dispatched:\nawait self.on.dispatch(self.get_current_rest)\nself.__dispatched = True\n- if \"type\" in event and event[\"type\"] == \"confirmation\":\n+ if event.get(\"type\"):\nif event[\"group_id\"] == self.group_id:\nreturn confirmation_token or \"dissatisfied\"\n- updates = event[\"updates\"] if \"updates\" in event else [event]\n+ updates = event.get(\"updates\", [event])\n+\ntry:\nfor update in updates:\n@@ -153,14 +157,14 @@ class Bot(HTTP, EventProcessor):\n)\nelse:\ntask = await (\n- self._chat_action_processor(obj=obj)\n+ self._chat_action_processor(obj=obj, client_info=client_info)\n)\nawait self._handler_return(task, obj, client_info=client_info)\nelse:\n# If this is an event of the group AND this is not SELF-EVENT\n- task = ensure_future(\n+ task = await (\nself._event_processor(obj=obj, event_type=update[\"type\"])\n)\n@@ -169,21 +173,23 @@ class Bot(HTTP, EventProcessor):\nif e[0] in self.error_handler.get_processor():\nhandler = self.error_handler.get_processor()[e[0]][\"call\"]\nself._logger.debug(\n- \"VKError ?{}! Processing it with handler <{}>\".format(\n- e, handler.__name__\n- )\n+ \"VKError ?{}! Processing it with handler <{}>\".format(e, handler.__name__)\n)\n- ensure_future(handler(e))\n+ await handler(e)\nelse:\nself._logger.error(\n- \"VKError! Add @bot.error_handler({}) to process this error!\".format(\n- e\n- )\n+ \"VKError! Add @bot.error_handler({}) to process this error!\".format(e)\n)\nraise VKError(e)\nreturn \"ok\"\ndef process(self, event: dict, confirmation_token: str = None) -> str:\n+ \"\"\"\n+ WHAT THE SHIT I MADE OH MY GODNESS!!!!\n+ :param event: VK Event\n+ :param confirmation_token: code which confirms VK callback\n+ :return: \"ok\"\n+ \"\"\"\nstatus = self.__loop.run_until_complete(self.emulate(event, confirmation_token))\nreturn status\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -109,7 +109,7 @@ class EventProcessor(RegexHelper):\n)\nreturn task\n- async def _chat_action_processor(self, obj: dict):\n+ async def _chat_action_processor(self, obj: dict, client_info: dict):\n\"\"\"\nChat Action Processor\n:param obj:\n@@ -126,7 +126,7 @@ class EventProcessor(RegexHelper):\nfor key in self.on.chat_action_types:\nrules = {**action, **key[\"rules\"]}\nif action[\"type\"] == key[\"name\"] and rules == action:\n- answer = Message(**obj, api=[self.api])\n+ answer = Message(**obj, api=[self.api], client_info=client_info)\nawait key[\"call\"](answer)\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 Poor code fix |
718,838 | 06.11.2019 19:29:20 | -10,800 | 9cb853da154436c4bf7db5dba2da5407f080f4c6 | v0.2 Message Separation
+ api fix | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -55,7 +55,7 @@ class Method(object):\n\"\"\"\nresponse = await self.request.post(\n- url=self.generate_method_url(group, method, _execute), params=params\n+ url=self.generate_method_url(group, method, _execute), data=params\n)\nif type(response) is not dict:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -9,6 +9,11 @@ import random\n# https://vk.com/dev/objects/message\n+def sep_bytes(text: str, max_bytes: int = 4096) -> list:\n+ text = text.encode('utf-8')\n+ separation = [text[i:i + max_bytes] for i in range(0, len(text), max_bytes)]\n+ return list(map(bytes.decode, separation)) if len(separation) else ['']\n+\nclass Action(Enum):\nchat_photo_update = \"chat_photo_update\"\n@@ -87,7 +92,8 @@ class Message(BaseModel):\nkeyboard: dict = None,\n**params\n):\n- return await self.api[0].request(\n+ for message in sep_bytes(message):\n+ m = await self.api[0].request(\n\"messages\",\n\"send\",\ndict(\n@@ -99,6 +105,7 @@ class Message(BaseModel):\n**params\n),\n)\n+ return m\ndef get_args(self):\n\"\"\"\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.2 Message Separation
+ api fix |
718,838 | 08.11.2019 22:59:11 | -10,800 | 8dab1c3dbcc87a95570dd3dac18335861962486b | VBML RELEASE! | [
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -5,7 +5,7 @@ with open('README.md', 'r', encoding='utf-8') as f:\nsetuptools.setup(\nname=\"vkbottle\",\n- version=\"1.0\",\n+ version=\"1.3\",\nauthor=\"timoniq\",\ndescription=\"Description..\",\nlong_description=long_description,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "-__version__ = \"0.2\" # Package VKBottle version\n+__version__ = \"0.3\" # Package VKBottle version\n__author__ = \"Arseniy Timonik\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/__init__.py",
"new_path": "vkbottle/framework/__init__.py",
"diff": "from .bot import Bot\nfrom .mailing import Mailing\n-from .patcher import VBMLValidators\nfrom .branch import Branch, ExitBranch\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -3,16 +3,15 @@ from ..handler import Handler, ErrorHandler\nfrom ..const import DEFAULT_BOT_FOLDER\nfrom ..utils import Logger\nfrom ..http import HTTP\n-from ..api import VKError, HandlerReturnError\n-from ..const import __version__\n-from concurrent.futures._base import TimeoutError as ConcurrentTimout\n-from asyncio import get_event_loop, AbstractEventLoop, ensure_future, TimeoutError\n+from ..api import VKError\n+from asyncio import get_event_loop, AbstractEventLoop, TimeoutError\n+from vbml import Patcher\n+from vbml.validators import ValidatorManager\nfrom aiohttp.client_exceptions import ClientConnectionError, ServerTimeoutError\nfrom ._event import EventTypes\nfrom .processor import EventProcessor\n-from .patcher import Patcher\nfrom .branch import BranchManager\n-from .branch.standart_branch import Branch, ExitBranch\n+from ..utils import folder_checkup\nDEFAULT_WAIT = 20\n@@ -24,6 +23,7 @@ class Bot(HTTP, EventProcessor):\ntoken: str,\ngroup_id: int,\ndebug: bool = True,\n+ validators: bool = True,\nplugin_folder: str = None,\nlog_to_file: bool = True,\nlog_to: str = None,\n@@ -36,12 +36,12 @@ class Bot(HTTP, EventProcessor):\nself.__dispatched = False\nself.api = Api(loop=self.__loop, token=token, group_id=group_id)\n- self.patcher = Patcher(plugin_folder or DEFAULT_BOT_FOLDER)\n+ self.patcher = Patcher()\nself._logger = Logger(\ndebug,\nlog_file=log_to,\n- plugin_folder=self.patcher.plugin_folder,\n+ plugin_folder=folder_checkup(plugin_folder),\nlogger_enabled=log_to_file,\n)\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/framework/patcher/.DS_Store",
"new_path": "vkbottle/framework/patcher/.DS_Store",
"diff": "Binary files a/vkbottle/framework/patcher/.DS_Store and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/framework/patcher/__init__.py",
"new_path": null,
"diff": "-from .patcher import Patcher\n-from .validators import VBMLValidators\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/framework/patcher/patcher.py",
"new_path": null,
"diff": "-from .whitelist import WhiteList\n-from .validators import VBMLValidators\n-from inspect import getmembers, ismethod\n-from typing import Optional, ClassVar\n-from ...utils import folder_checkup\n-from ...api import VBMLError\n-\n-\n-class Patcher(WhiteList):\n- \"\"\"VKBottle Patcher version 0.1\n- Needed for:\n- * Validators Support\n- * WhiteList Support\n- \"\"\"\n-\n- def __init__(self, plugin_folder: str):\n- self.use_whitelist: bool = False\n- self.plugin_folder: str = folder_checkup(plugin_folder)\n- self.regex_validators: dict = self.__provide_validators(VBMLValidators)\n- self.disable_validators: bool = False\n-\n- self.whitelist: list = list()\n-\n- def __call__(\n- self,\n- validators: ClassVar = None,\n- disable_validators: bool = None,\n- **validators_kwargs\n- ):\n- if validators:\n- if issubclass(validators, VBMLValidators):\n- self.regex_validators = self.__provide_validators(\n- validators, validators_kwargs\n- )\n- else:\n- raise VBMLError('Custom validators cls should inherit VBMLValidators cls')\n- if disable_validators:\n- self.disable_validators = True\n-\n- @staticmethod\n- def __provide_validators(validators, validators_kwargs: dict = None) -> dict:\n- members_tuple = getmembers(\n- validators(**validators_kwargs if validators_kwargs else {}),\n- predicate=ismethod,\n- )\n- return dict((x, y) for x, y in members_tuple if not x.startswith(\"__\"))\n-\n- async def check_validators(self, check_object: dict, keys: dict):\n- if not self.disable_validators:\n-\n- validators = check_object[\"validators\"]\n- valid_dict: Optional[dict] = {}\n-\n- for key in keys:\n- if key in validators:\n- for validator in validators[key]:\n- k = await self.regex_validators[validator](\n- keys[key], *validators[key][validator]\n- )\n- if k is None:\n- valid_dict = None\n- break\n- else:\n- valid_dict[key] = k\n- else:\n- valid_dict[key] = keys[key]\n-\n- return valid_dict\n-\n- return keys\n-\n- def get_current(self) -> dict:\n- return {\n- \"plugin_folder\": self.plugin_folder,\n- \"use_whitelist\": self.use_whitelist,\n- }\n-\n- def __repr__(self):\n- return \"<Patcher plugin_folder='{}' use_whitelist={}>\".format(\n- *self.get_current().values()\n- )\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/framework/patcher/validators/__init__.py",
"new_path": null,
"diff": "-from .vbml import *\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/framework/patcher/validators/vbml.py",
"new_path": null,
"diff": "-from urllib import parse\n-\n-\n-class VBMLValidators:\n- def __init__(self):\n- pass\n-\n- async def int(self, value: str):\n- if value.isdigit():\n- return int(value)\n- return\n-\n- async def float(self, value: str):\n- try:\n- return float(value)\n- except ValueError:\n- return\n-\n- async def url(self, value: str):\n- scheme = parse.urlparse(value)\n- if scheme.netloc != \"\":\n- return value\n- return\n-\n- async def validator(self, value: str, *args):\n- print(\n- \"Value {} was validated by default validator! Hold on.\\nReceived args: {}\".format(\n- value, args\n- )\n- )\n- return value\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/framework/patcher/whitelist.py",
"new_path": null,
"diff": "-import os\n-\n-\n-class WhiteList(object):\n- plugin_folder: str\n- use_whitelist: bool\n- whitelist: list\n-\n- def whitelist_initialise(self):\n- whitelist_path = self.plugin_folder + \"/whitelist.txt\"\n-\n- if not os.path.isfile(whitelist_path):\n- open(whitelist_path, \"a\").close()\n-\n- with open(whitelist_path, \"r+\") as whitelist_doc:\n- if self.whitelist != list():\n- for string in self.whitelist:\n- whitelist_doc.write(str(string) + \"\\n\")\n- else:\n- self.whitelist = [\n- int(line) for line in whitelist_doc.read().splitlines()\n- ]\n-\n- self.use_whitelist = True\n-\n- def __update_whitelist_doc(self):\n- if self.use_whitelist:\n- whitelist_path = self.plugin_folder + \"/whitelist.txt\"\n- with open(whitelist_path, \"w\") as f:\n- for string in self.whitelist:\n- f.write(str(string) + \"\\n\")\n-\n- async def add_whitelist(self, *user_id: int):\n- if self.use_whitelist:\n- self.whitelist.extend(user_id)\n- self.__update_whitelist_doc()\n-\n- async def remove_from_whitelist(self, *user_ids: int):\n- if self.use_whitelist:\n- for user_id in user_ids:\n- if user_id in self.whitelist:\n- self.whitelist.pop(self.whitelist.index(user_id))\n- self.__update_whitelist_doc()\n- return self.whitelist\n-\n- async def check_for_whitelist(self, obj: dict):\n- peer_id = obj.get(\"from_id\", 0)\n- return self.use_whitelist is False or peer_id in self.whitelist\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -2,12 +2,12 @@ from ..types.message import Message\nfrom ..api import Api, HandlerReturnError\nfrom ..handler import Handler\nfrom ..utils import Logger\n-from .patcher import Patcher\nfrom .branch import BranchManager\nfrom asyncio import AbstractEventLoop, ensure_future\nfrom re import sub\nfrom .regex import RegexHelper\nfrom .branch import Branch, ExitBranch\n+from vbml import Pattern, Patcher\nclass EventProcessor(RegexHelper):\n@@ -34,20 +34,16 @@ class EventProcessor(RegexHelper):\n)\nfor key in self.on.message.inner:\n- if key.match(answer.text) is not None:\n+ key: Pattern\n+ if await self.patcher.check_async(answer.text, key) is not None:\nmatching = self.on.message.inner[key]\n- validators_check = await self.patcher.check_validators(\n- check_object=matching, keys=key.match(answer.text).groupdict()\n- )\n-\n- if validators_check is not None:\n# [Feature] Async Use\n# Added v0.19#master\ntask = await matching[\"call\"](\n*([answer] if not matching[\"ignore_ans\"] else []),\n- **validators_check\n+ **key.dict()\n)\nself._logger.debug(\n@@ -58,7 +54,9 @@ class EventProcessor(RegexHelper):\nreturn task\nif self.on.undefined_func:\n- await (self.on.undefined_func(answer))\n+ await (\n+ self.on.undefined_func(answer)\n+ )\nself._logger.debug(\n\"New message compiled with decorator <\\x1b[35mon-message-undefined\\x1b[0m> (from: {})\".format(\nanswer.from_id\n@@ -80,7 +78,8 @@ class EventProcessor(RegexHelper):\n)\nfor key in self.on.chat_message.inner:\n- if key.match(answer.text) is not None:\n+ key: Pattern\n+ if await self.patcher.check_async(answer.text, key) is not None:\nself._logger.debug(\n'-> MESSAGE FROM CHAT {} TEXT \"{}\" TIME %#%'.format(\n@@ -90,16 +89,11 @@ class EventProcessor(RegexHelper):\nmatching = self.on.chat_message.inner[key]\n- validators_check = await self.patcher.check_validators(\n- check_object=matching, keys=key.match(answer.text).groupdict()\n- )\n-\n- if validators_check is not None:\n# [Feature] Async Use\n# Added v0.19#master\ntask = await matching[\"call\"](\n*([answer] if not matching[\"ignore_ans\"] else []),\n- **validators_check\n+ **key.dict()\n)\nself._logger.debug(\n@@ -146,7 +140,7 @@ class EventProcessor(RegexHelper):\nself._logger.debug(\n'-> EVENT FROM {} TYPE \"{}\" TIME %#%'.format(\n- obj[\"user_id\"] if \"user_id\" in obj else \"from_id\", event_type.upper()\n+ obj[\"user_id\"] if \"user_id\" in obj else obj[\"from_id\"], event_type.upper()\n)\n)\n@@ -179,7 +173,9 @@ class EventProcessor(RegexHelper):\n)\nbranch = self.branch.load(answer.peer_id)\n- task = ensure_future(self.branch.branches[branch[0]](answer, **branch[1]))\n+ task = await (\n+ self.branch.branches[branch[0]](answer, **branch[1])\n+ )\ntask = await task\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "-from .regex import vbml_parser, re_parser\nfrom .events import Event\nfrom ..utils import dict_of_dicts_merge, Logger\nfrom inspect import signature\n@@ -6,6 +5,7 @@ from typing import Callable\nfrom ..const import __version__\nfrom inspect import iscoroutinefunction\nfrom ..api import HandlerError\n+from vbml import Patcher, Pattern\ndef should_ignore_ans(func: Callable, arguments: list) -> bool:\n@@ -26,9 +26,9 @@ class Handler(object):\nself.message: MessageHandler = MessageHandler()\nself.chat_message: MessageHandler = MessageHandler()\nself.message_both: MessageHandler = MessageHandler()\n- self.__undefined_message_func = None\n-\nself.event: Event = Event()\n+\n+ self.__undefined_message_func = None\nself.__chat_action_types: list = list()\nasync def dispatch(\n@@ -91,7 +91,7 @@ class Handler(object):\ndef chat_mention(self):\ndef decorator(func):\n- pattern = re_parser(r\"\\[(club|public){}\\|.*?]\".format(self.__group_id))\n+ pattern = Pattern(text=\"\", pattern=r\"\\[(club|public){}\\|.*?]\".format(self.__group_id))\nignore_ans = (\nlen(signature(func).parameters) < 1\n)\n@@ -143,15 +143,14 @@ class MessageHandler:\n:return: True\n\"\"\"\n- pattern, validators, arguments = vbml_parser(\n+ pattern = Pattern(\ntext,\n- pattern or (\"(?i)\" if lower else \"\") + \"{}$\",\nprefix=self.prefix if command else None,\n+ pattern=pattern or (\"(?i)\" if lower else \"\") + \"{}$\",\n)\nself.inner[pattern] = dict(\ncall=func,\n- validators=validators,\n- ignore_ans=should_ignore_ans(func, arguments)\n+ ignore_ans=should_ignore_ans(func, pattern.arguments)\n)\ndef __call__(\n@@ -168,15 +167,14 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n- pattern, validators, arguments = vbml_parser(\n+ pattern = Pattern(\ntext,\n- (\"(?i)\" if lower else \"\") + \"{}$\",\nprefix=self.prefix if command else None,\n+ pattern=(\"(?i)\" if lower else \"\") + \"{}$\",\n)\nself.inner[pattern] = dict(\ncall=func,\n- validators=validators,\n- ignore_ans=should_ignore_ans(func, arguments)\n+ ignore_ans=should_ignore_ans(func, pattern.arguments)\n)\nreturn func\n@@ -200,15 +198,14 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n- pattern, validators, arguments = vbml_parser(\n+ pattern = Pattern(\ntext,\n- (\"(?i)\" if lower else \"\") + \"{}.*?\",\nprefix=self.prefix if command else None,\n+ pattern=(\"(?i)\" if lower else \"\") + \"{}.*?\",\n)\nself.inner[pattern] = dict(\ncall=func,\n- validators=validators,\n- ignore_ans=should_ignore_ans(func, arguments)\n+ ignore_ans=should_ignore_ans(func, pattern.arguments)\n)\nreturn func\n@@ -224,9 +221,8 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n- self.inner[re_parser(pattern)] = dict(\n+ self.inner[Pattern(text=\"\", pattern=pattern)] = dict(\ncall=func,\n- validators={},\nignore_ans=should_ignore_ans(func, [])\n)\nreturn func\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/validators.py",
"new_path": null,
"diff": "-from .framework.patcher.validators import *\n"
}
] | Python | MIT License | vkbottle/vkbottle | VBML RELEASE! |
718,838 | 09.11.2019 16:03:17 | -10,800 | 6a0443f1e4fdde6f3114b5d9c25f12dd7eb68266 | fix plugin_folder | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -41,7 +41,7 @@ class Bot(HTTP, EventProcessor):\nself._logger = Logger(\ndebug,\nlog_file=log_to,\n- plugin_folder=folder_checkup(plugin_folder),\n+ plugin_folder=folder_checkup(plugin_folder or 'vkbottle_bot'),\nlogger_enabled=log_to_file,\n)\n"
}
] | Python | MIT License | vkbottle/vkbottle | fix plugin_folder |
718,838 | 09.11.2019 18:25:17 | -10,800 | c3196ec017303059ae9962483a07a02e40a2c7e3 | fix message_undefined bug | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -32,6 +32,7 @@ class EventProcessor(RegexHelper):\nanswer.from_id, answer.text.replace(\"\\n\", \" \")\n)\n)\n+ found: bool = False\nfor key in self.on.message.inner:\nkey: Pattern\n@@ -51,8 +52,10 @@ class EventProcessor(RegexHelper):\nmatching[\"call\"].__name__, answer.from_id\n)\n)\n+ found = True\nreturn task\n+ if not found:\nif self.on.undefined_func:\nawait (\nself.on.undefined_func(answer)\n"
}
] | Python | MIT License | vkbottle/vkbottle | fix message_undefined bug |
718,838 | 09.11.2019 19:14:06 | -10,800 | fba4e62632b1ec93bba531692beb7c7ad8e6b091 | vbml installation fixik | [
{
"change_type": "MODIFY",
"old_path": "requirements.txt",
"new_path": "requirements.txt",
"diff": "@@ -2,4 +2,4 @@ aiohttp\npydantic\ncolorama\ntermcolor\n--e https://github.com/timoniq/vbml/archive/master.zip\n\\ No newline at end of file\n+vbml\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "@@ -18,6 +18,5 @@ setuptools.setup(\n\"Programming Language :: Python :: 3.7\",\n\"Operating System :: OS Independent\",\n],\n- install_requires=[\"aiohttp\", \"pydantic\", \"colorama\", \"termcolor\",\n- \"vbml @ https://github.com/timoniq/vbml/archive/master.zip\"],\n+ install_requires=[\"aiohttp\", \"pydantic\", \"colorama\", \"termcolor\", \"vbml\"],\n)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/const.py",
"new_path": "vkbottle/const.py",
"diff": "@@ -11,3 +11,5 @@ DEFAULT_BOT_FOLDER = \"vkbottle_bot\"\nVERSION_REST = (\n\"https://raw.githubusercontent.com/timoniq/vkbottle-rest/master/version.json\"\n)\n+\n+VBML_INSTALL = 'pip install https://github.com/timoniq/vbml/archive/master.zip --upgrade'\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "+from ..const import DEFAULT_BOT_FOLDER, VBML_INSTALL\n+\n+try:\n+ import vbml\n+except ImportError:\n+ print('Please install vbml to use VKBottle. Use command: {}'.format(VBML_INSTALL))\n+\nfrom ..api import Api\nfrom ..handler import Handler, ErrorHandler\n-from ..const import DEFAULT_BOT_FOLDER\nfrom ..utils import Logger\nfrom ..http import HTTP\nfrom ..api import VKError\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -47,6 +47,7 @@ class Logger(object):\nself.__plugin_folder = plugin_folder\nself.__logger_name = logger_name\nself.__logger_enabled = logger_enabled\n+ self.colored = colored\nself.logger = logging.getLogger(logger_name or \"VKBottle\")\nself.log_path = \"{path}/{log_file}\".format(\n"
}
] | Python | MIT License | vkbottle/vkbottle | vbml installation fixik |
718,838 | 11.11.2019 16:23:53 | -10,800 | 1b6f34828a740a5567aaf879a32004301b0a8d91 | v0.3 crash reports (0.1) | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -18,6 +18,7 @@ from ._event import EventTypes\nfrom .processor import EventProcessor\nfrom .branch import BranchManager\nfrom ..utils import folder_checkup\n+import traceback\nDEFAULT_WAIT = 20\n@@ -132,7 +133,7 @@ class Bot(HTTP, EventProcessor):\nself.__dispatched = True\nif event.get(\"type\"):\n- if event[\"group_id\"] == self.group_id:\n+ if event.get(\"group_id\") == self.group_id:\nreturn confirmation_token or \"dissatisfied\"\nupdates = event.get(\"updates\", [event])\n@@ -194,6 +195,9 @@ class Bot(HTTP, EventProcessor):\n)\nraise VKError(e)\n+ except Exception as e:\n+ self._logger.error('While bot worked error occurred TIME %#%\\n\\n{}'.format(traceback.format_exc()))\n+\nreturn \"ok\"\ndef process(self, event: dict, confirmation_token: str = None) -> str:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/regex/regex_addon.py",
"new_path": "vkbottle/framework/regex/regex_addon.py",
"diff": "@@ -5,5 +5,5 @@ class RegexHelper(object):\ngroup_id: int\ndef init_bot_mention(self, text):\n- pattern = r'^\\[club' + str(self.group_id) + r'\\|[@a-zA-Z0-9.]+\\][\\,]{0,1} '\n+ pattern = r'^\\[club' + str(self.group_id) + r'\\|.*?\\][\\,]{0,1} '\nreturn re.sub(pattern, '', text)\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.3 crash reports (0.1) |
718,838 | 11.11.2019 17:35:54 | -10,800 | a364fdc053313da171e3f4a5717620c3618399c8 | v0.3 User API, TaskManager fix | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "-from .framework import Bot, Mailing, Branch, ExitBranch\n+from .framework import (\n+ Bot,\n+ Mailing,\n+ Branch,\n+ ExitBranch,\n+ User\n+)\nfrom .types.message import Message\nfrom .utils.task import TaskManager\nfrom .api.keyboard import keyboard_gen\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -94,7 +94,7 @@ class Api(object):\nReceive only kwargs, no positional arguments. Kwargs can be skipped\n\"\"\"\n- def __init__(self, loop: AbstractEventLoop, token: str, group_id: int, method=None):\n+ def __init__(self, loop: AbstractEventLoop, token: str, group_id: int = None, method=None):\n\"\"\"\nVK Api Wrapper\n:param loop: asyncio event loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/__init__.py",
"new_path": "vkbottle/framework/__init__.py",
"diff": "from .bot import Bot\n+from .user import User\nfrom .mailing import Mailing\nfrom .branch import Branch, ExitBranch\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/user.py",
"diff": "+from ..http import HTTP\n+from ..api import Api\n+from asyncio import get_event_loop, AbstractEventLoop\n+import typing\n+\n+\n+class User(HTTP):\n+ def __init__(self, token: str, user_id: int = None, debug: bool = False):\n+ self.__loop: AbstractEventLoop = get_event_loop()\n+ self.__debug: bool = debug\n+ self.api: Api = Api(self.__loop, token)\n+ self.user_id: typing.Optional[int] = user_id\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "import asyncio\n-from asyncio import iscoroutinefunction\n-from typing import List, Callable\n+from asyncio import coroutine\n+from types import CoroutineType\n+from typing import List, Callable, Coroutine\n\"\"\"\n@@ -30,7 +31,7 @@ SOFTWARE.\nclass TaskManager:\ndef __init__(self, loop: asyncio.AbstractEventLoop):\n- self.tasks: List[Callable] = []\n+ self.tasks: List[Coroutine] = []\nself.loop: asyncio.AbstractEventLoop = loop\ndef run(\n@@ -51,7 +52,7 @@ class TaskManager:\nif asyncio_debug_mode:\nself.loop.set_debug(True)\n- [self.loop.create_task(task()) for task in self.tasks]\n+ [self.loop.create_task(task) for task in self.tasks]\nself.loop.run_forever()\n@@ -66,13 +67,13 @@ class TaskManager:\n\"\"\"\nself.loop.close()\n- def add_task(self, task: Callable):\n+ def add_task(self, task: CoroutineType):\n\"\"\"\nAdd task to loop when loop don`t started.\n:param task: coroutine for run in loop\n:return:\n\"\"\"\n- if iscoroutinefunction(task):\n+ if isinstance(task, CoroutineType):\nself.tasks.append(task)\nelse:\nraise RuntimeError(\"Unexpected task. Tasks may be only coroutine functions\")\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.3 User API, TaskManager fix |
718,838 | 11.11.2019 17:38:15 | -10,800 | 81e444fbd1a7ee8ce21d31f56d05164321a68fee | v0.3 run_forever is not needed | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "@@ -54,8 +54,6 @@ class TaskManager:\n[self.loop.create_task(task) for task in self.tasks]\n- self.loop.run_forever()\n-\nfinally:\nif shutdown is not None:\nself.loop.run_until_complete(shutdown())\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.3 run_forever is not needed |
718,838 | 11.11.2019 17:58:53 | -10,800 | 8ac4f103383245942abeeb02a592d733893eb51a | v0.3 fix variable privacy | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -42,25 +42,25 @@ class Bot(HTTP, EventProcessor):\nself.__token: str = token\nself.__group_id: int = group_id\nself.__loop: AbstractEventLoop = get_event_loop()\n- self.__debug = debug\n+ self.__debug: bool = debug\nself.__wait = None\n- self.__dispatched = False\n+ self.__dispatched: bool = False\n- self.api = Api(loop=self.__loop, token=token, group_id=group_id)\n- self.patcher = Patcher()\n- if not self.patcher.manager:\n- self.patcher.add_manager(ValidatorManager(Vals))\n+ self.__api: Api = Api(loop=self.__loop, token=token, group_id=group_id)\n+ self._patcher: Patcher = Patcher()\n+ if not self._patcher.manager:\n+ self._patcher.add_manager(ValidatorManager(Vals))\n- self._logger = Logger(\n+ self._logger: Logger = Logger(\ndebug,\nlog_file=log_to,\nplugin_folder=folder_checkup(plugin_folder or 'vkbottle_bot'),\nlogger_enabled=log_to_file,\n)\n- self.branch = BranchManager(plugin_folder or DEFAULT_BOT_FOLDER)\n- self.on = Handler(self._logger, group_id)\n- self.error_handler = ErrorHandler()\n+ self.branch: BranchManager = BranchManager(plugin_folder or DEFAULT_BOT_FOLDER)\n+ self.on: Handler = Handler(self._logger, group_id)\n+ self.error_handler: ErrorHandler = ErrorHandler()\n@property\ndef group_id(self):\n@@ -70,6 +70,14 @@ class Bot(HTTP, EventProcessor):\ndef loop(self):\nreturn self.__loop\n+ @property\n+ def api(self):\n+ return self.__api\n+\n+ @property\n+ def patcher(self):\n+ return self._patcher\n+\nasync def get_server(self) -> dict:\n\"\"\"\nGet an longPoll server for long request create\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "@@ -8,5 +8,9 @@ class User(HTTP):\ndef __init__(self, token: str, user_id: int = None, debug: bool = False):\nself.__loop: AbstractEventLoop = get_event_loop()\nself.__debug: bool = debug\n- self.api: Api = Api(self.__loop, token)\n+ self.__api: Api = Api(self.__loop, token)\nself.user_id: typing.Optional[int] = user_id\n+\n+ @property\n+ def api(self):\n+ return self.__api\n\\ No newline at end of file\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.3 fix variable privacy |
718,838 | 12.11.2019 20:30:36 | -10,800 | 2cea08d9c728044aec8ba256ef4b80db3209d862 | trying to fix my broken fix... | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -6,6 +6,7 @@ from colorama import init as color_opt\nimport os\nimport re\nimport time\n+from pathlib import Path\nLOG_FILE_PATTERN = r\"[a-zA-Z0-9]+\\.log\"\n@@ -51,17 +52,13 @@ class Logger(object):\nself.colored = colored\nself.logger = logging.getLogger(logger_name or \"VKBottle\")\n- path = '{path}/logs'.format(path=plugin_folder)\n+ path = Path(plugin_folder)\n+ logs_path = path.joinpath('logs')\n- self.log_path = \"{path}/{log_file}_{time}.log\".format(\n- path=path,\n- log_file=log_file\n- if log_file and re.match(LOG_FILE_PATTERN, log_file)\n- else DEFAULT_LOG_NAME,\n+ self.log_path = logs_path.joinpath(\"{log_file}_{time}.log\".format(\n+ log_file=log_file or DEFAULT_LOG_NAME,\ntime=time.strftime(\"%m-%d_%H:%M:%S\", time.localtime())\n- )\n- if not os.path.isdir(path):\n- os.makedirs('{path}/logs'.format(path=plugin_folder))\n+ ))\nif logger_enabled:\n"
}
] | Python | MIT License | vkbottle/vkbottle | trying to fix my broken fix... |
718,838 | 12.11.2019 20:39:29 | -10,800 | 6a683bf8a719fccceba9d32c10fb3cc1b9650c2b | v0.3 cool fixik (nolik) | [
{
"change_type": "MODIFY",
"old_path": ".DS_Store",
"new_path": ".DS_Store",
"diff": "Binary files a/.DS_Store and b/.DS_Store differ\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -55,6 +55,9 @@ class Logger(object):\npath = Path(plugin_folder)\nlogs_path = path.joinpath('logs')\n+ if not logs_path.exists():\n+ logs_path.mkdir(parents=True)\n+\nself.log_path = logs_path.joinpath(\"{log_file}_{time}.log\".format(\nlog_file=log_file or DEFAULT_LOG_NAME,\ntime=time.strftime(\"%m-%d_%H:%M:%S\", time.localtime())\n"
}
] | Python | MIT License | vkbottle/vkbottle | v0.3 cool fixik (nolik) |
718,838 | 17.11.2019 19:43:00 | -10,800 | 3aa6748f959dfd4b162052e19f38b58e389e2736 | shit deletion | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -34,9 +34,8 @@ class Bot(HTTP, EventProcessor):\ntoken: str,\ngroup_id: int,\ndebug: bool = True,\n- validators: bool = True,\nplugin_folder: str = None,\n- log_to_file: bool = True,\n+ log_to_file: bool = False,\nlog_to: str = None,\n):\nself.__token: str = token\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -42,7 +42,7 @@ class EventProcessor(RegexHelper):\nanswer = Message(**obj, api=[self.api], client_info=client_info)\nif self.on.pre:\n- ensure_future(self.on.pre(answer))\n+ await (self.on.pre(answer))\nself._logger.debug(\n'-> MESSAGE FROM {} TEXT \"{}\" TIME %#%'.format(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -155,11 +155,10 @@ class MessageHandler:\n:param pattern: any regex pattern pattern. {} means text which will be formatted\n:return: True\n\"\"\"\n-\n+ prefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\npattern = Pattern(\ntext,\n- prefix=self.prefix if command else None,\n- pattern=pattern or (\"(?i)\" if lower else \"\") + \"{}$\",\n+ pattern=pattern or (\"(?i)\" if lower else \"\") + prefix + \"{}$\",\n)\nself.inner[pattern] = dict(\ncall=func,\n@@ -180,10 +179,10 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n+ prefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\npattern = Pattern(\ntext,\n- prefix=self.prefix if command else None,\n- pattern=(\"(?i)\" if lower else \"\") + \"{}$\",\n+ pattern=(\"(?i)\" if lower else \"\") + prefix + \"{}$\",\n)\nself.inner[pattern] = dict(\ncall=func,\n@@ -211,10 +210,10 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n+ prefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\npattern = Pattern(\ntext,\n- prefix=self.prefix if command else None,\n- pattern=(\"(?i)\" if lower else \"\") + \"{}.*?\",\n+ pattern=(\"(?i)\" if lower else \"\") + prefix + \"{}.*?\",\n)\nself.inner[pattern] = dict(\ncall=func,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -60,7 +60,7 @@ class Logger(object):\nelse DEFAULT_LOG_NAME,\ntime=time.strftime(\"%m-%d_%H:%M:%S\", time.localtime())\n)\n- if not os.path.isdir(path):\n+ if not os.path.isdir(path) and logger_enabled:\nos.makedirs('{path}/logs'.format(path=plugin_folder))\nif logger_enabled:\n"
}
] | Python | MIT License | vkbottle/vkbottle | shit deletion |
718,838 | 23.11.2019 13:02:53 | -10,800 | ff5267214ce80c69af55317014c3b7c5e8a844a1 | add desc handler | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -6,7 +6,7 @@ except ImportError:\nprint('Please install vbml to use VKBottle. Use command: {}'.format(VBML_INSTALL))\nfrom ..api import Api\n-from ..handler import Handler, ErrorHandler\n+from ..handler import Handler, ErrorHandler, DescribedHandler\nfrom ..utils import Logger\nfrom ..http import HTTP\nfrom ..api import VKError\n@@ -19,6 +19,7 @@ from .processor import EventProcessor\nfrom .branch import BranchManager\nfrom ..utils import folder_checkup\nimport traceback\n+import typing\nDEFAULT_WAIT = 20\n@@ -44,6 +45,7 @@ class Bot(HTTP, EventProcessor):\nself.__debug: bool = debug\nself.__wait = None\nself.__dispatched: bool = False\n+ self.described_handler = DescribedHandler()\nself.__api: Api = Api(loop=self.__loop, token=token, group_id=group_id)\nself._patcher: Patcher = Patcher()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/__init__.py",
"new_path": "vkbottle/handler/__init__.py",
"diff": "-from .handler import Handler\n+from .handler import Handler, DescribedHandler\nfrom .error import ErrorHandler\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "from .events import Event\nfrom ..utils import dict_of_dicts_merge, Logger\nfrom inspect import signature\n-from typing import Callable, Optional\n+from typing import Callable, Optional, Dict, Union\nfrom ..const import __version__\nfrom inspect import iscoroutinefunction\nfrom ..api import HandlerError\n@@ -251,3 +251,33 @@ class MessageHandler:\nreturn func\nreturn decorator\n+\n+\n+class DescribedHandler:\n+ described_handlers_by_func: Dict[Callable, Dict] = {}\n+ described_handlers_by_name: Dict[Callable, Dict] = {}\n+\n+ def __init__(self):\n+ pass\n+\n+ def __call__(self, name: str = None, description: str = None):\n+ def decorator(func):\n+ print(\"o\")\n+\n+ self.described_handlers_by_func[func] = dict(\n+ name=name or \"\",\n+ description=description or \"\"\n+ )\n+ if name:\n+ self.described_handlers_by_name[name] = dict(\n+ name=name or \"\",\n+ description=description or \"\"\n+ )\n+ return func\n+\n+ return decorator\n+\n+ def get(self, name: Union[Callable, str], default=None):\n+ if isinstance(name, Callable):\n+ return self.described_handlers_by_func.get(name, default)\n+ return self.described_handlers_by_name.get(name, default)\n"
}
] | Python | MIT License | vkbottle/vkbottle | add desc handler |
718,838 | 02.12.2019 16:44:42 | -10,800 | ee8d55c08292ebe5eb7188a64fcad803b3af8998 | add patcher option | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -47,6 +47,7 @@ class Bot(HTTP, EventProcessor):\nplugin_folder: str = None,\nlog_to_file: bool = False,\nlog_to: str = None,\n+ vbml_patcher: Patcher = None\n):\nself.__token: str = token\nself.__group_id: int = group_id\n@@ -57,7 +58,7 @@ class Bot(HTTP, EventProcessor):\nself._status: BotStatus = BotStatus()\nself.__api: Api = Api(loop=self.__loop, token=token, group_id=group_id)\n- self._patcher: Patcher = Patcher()\n+ self._patcher: Patcher = vbml_patcher or Patcher()\nif not self._patcher.manager:\nself._patcher.add_manager(ValidatorManager(Vals))\n"
}
] | Python | MIT License | vkbottle/vkbottle | add patcher option |
718,838 | 14.12.2019 19:58:17 | -10,800 | 6ac31a0769f45815e803761193b286036dfde1b0 | o4erednoy fix.. | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -97,7 +97,6 @@ class Message(BaseModel):\n\"send\",\ndict(\npeer_id=self.peer_id,\n- keyboard=keyboard,\nrandom_id=random.randint(-2e9, 2e9),\n**{k: v for k, v in locals().items() if v}\n)\n"
}
] | Python | MIT License | vkbottle/vkbottle | o4erednoy fix.. |
718,838 | 14.12.2019 20:11:10 | -10,800 | e1bdb736cf5dff2d46ff75ca32523ef2223bad9d | plodim fixikov | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -67,7 +67,7 @@ class Message(BaseModel):\nasync def reply(\nself,\n- message: str = \"…\",\n+ message: str = None,\nattachment: str = None,\nkeyboard: dict = None,\n**params\n@@ -85,7 +85,7 @@ class Message(BaseModel):\nasync def __call__(\nself,\n- message: str = \"…\",\n+ message: str = None,\nattachment: str = None,\nkeyboard: dict = None,\ntemplate: dict = None,\n"
}
] | Python | MIT License | vkbottle/vkbottle | plodim fixikov |
718,838 | 14.12.2019 20:19:13 | -10,800 | c519e0282bfee51f451c2f7436ca0cc1a61e5424 | rodil 10 fixikov (11010110) | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -72,6 +72,7 @@ class Message(BaseModel):\nkeyboard: dict = None,\n**params\n):\n+ locals().update(params)\nreturn await self.api[0].request(\n\"messages\",\n\"send\",\n@@ -79,7 +80,7 @@ class Message(BaseModel):\npeer_id=self.peer_id,\nreply_to=self.id,\nrandom_id=random.randint(-2e9, 2e9),\n- **{k: v for k, v in locals().items() if v}\n+ **{k: v for k, v in locals().items() if v is not None and k not in [\"self\", \"params\"]}\n),\n)\n@@ -91,14 +92,15 @@ class Message(BaseModel):\ntemplate: dict = None,\n**params\n):\n- for message in sep_bytes(message):\n+ locals().update(params)\n+ for message in sep_bytes(message or \"\"):\nm = await self.api[0].request(\n\"messages\",\n\"send\",\ndict(\npeer_id=self.peer_id,\nrandom_id=random.randint(-2e9, 2e9),\n- **{k: v for k, v in locals().items() if v}\n+ **{k: v for k, v in locals().items() if v is not None and k not in [\"self\", \"params\"]}\n)\n)\nreturn m\n"
}
] | Python | MIT License | vkbottle/vkbottle | rodil 10 fixikov (11010110) |
718,838 | 14.12.2019 22:00:14 | -10,800 | 2d721cc818da27a129556cb20f40be0cf9e2ad9f | fixed client_info | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -45,6 +45,8 @@ class MessageAction(BaseModel):\nclass ClientInfo(BaseModel):\nbutton_actions: list = None\nkeyboard: bool = None\n+ inline_keyboard: bool = None\n+ carousel: bool = None\nlang_id: int = None\n"
}
] | Python | MIT License | vkbottle/vkbottle | fixed client_info |
718,838 | 15.12.2019 10:45:37 | -10,800 | 3a767edd83321236ebaf3ad44fffcefdc0c1d301 | fix bm length | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -230,10 +230,11 @@ class EventProcessor(RegexHelper):\ntask = await (self.branch.branches[branch[0]](answer, **branch[1]))\ntask = await self._handler_return(task, obj, client_info)\n+ _kw = str(branch[1])\nself._logger.debug(\n\"New BRANCHED-message compiled with branch <\\x1b[35m{}\\x1b[0m> (from: {})\".format(\n- '\"{}\" with {} kwargs'.format(branch[0], branch[1]), answer.from_id\n+ '\"{}\" with {} kwargs'.format(branch[0], _kw if len(_kw) < 100 else _kw[1:99]), answer.from_id\n)\n)\nreturn task\n"
}
] | Python | MIT License | vkbottle/vkbottle | fix bm length |
718,838 | 15.12.2019 14:07:08 | -10,800 | 050dd14af690402927d3c826019626c4bbdc43f4 | fix keyboard gen | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/keyboard/generator.py",
"new_path": "vkbottle/api/keyboard/generator.py",
"diff": "@@ -19,16 +19,15 @@ def keyboard_gen(\nfor row in rows:\nrow_buttons = list()\nfor button in row:\n+ button = {k: v for k, v in button.items()}\nrow_buttons.append(\ndict(\naction=dict(\n- type=\"text\" if \"type\" not in button else button[\"type\"],\n- label=button[\"text\"],\n- payload=json.dumps(\n- \"\" if \"payload\" not in button else button[\"payload\"]\n+ type=button.get(\"type\", \"text\"),\n+ label=button.get(\"text\", button.get(\"label\")),\n+ **{k: v for k, v in button.items() if k not in [\"type\", \"label\"]}\n),\n- ),\n- color=\"default\" if \"color\" not in button else button[\"color\"],\n+ color=button.get(\"color\", \"default\"),\n)\n)\nbuttons.append(row_buttons)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -234,7 +234,7 @@ class EventProcessor(RegexHelper):\nself._logger.debug(\n\"New BRANCHED-message compiled with branch <\\x1b[35m{}\\x1b[0m> (from: {})\".format(\n- '\"{}\" with {} kwargs'.format(branch[0], _kw if len(_kw) < 100 else _kw[1:99]), answer.from_id\n+ '\"{}\" with {} kwargs'.format(branch[0], _kw if len(_kw) < 100 else _kw[1:99] + \"...\"), answer.from_id\n)\n)\nreturn task\n"
}
] | Python | MIT License | vkbottle/vkbottle | fix keyboard gen |
718,838 | 15.12.2019 19:53:11 | -10,800 | 5759426dded8046cc868b03c70ad0feadfbaf582 | template doc | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/template.md",
"diff": "+# Template\n+## Carousel\n+Import elements:\n+```python\n+from vkbottler.vkbottle import template_gen, TemplateElement\n+```\n+`template_gen` - create template json by the template elements\n+\n+Example:\n+```python\n+from vkbottler.vkbottle import template_gen, TemplateElement, keyboard_gen\n+template = template_gen(\n+ TemplateElement(\n+ \"A title\",\n+ \"A description\",\n+ \"-189607270_457240272\",\n+ buttons=keyboard_gen(\n+ [[\n+ {\"label\": \"A button\"},\n+ {\"type\": \"open_link\", \"link\": \"https://google.com\", \"label\": \"A link\"}\n+ ]]\n+ )\n+ ),\n+ TemplateElement(\n+ \"A title of second element\",\n+ \"Second element description\",\n+ \"-189607270_457240272\",\n+ buttons=keyboard_gen(\n+ [[\n+ {\"label\": \"A button\"},\n+ {\"type\": \"open_link\", \"link\": \"https://github.com/timoniq/vkbottle\", \"label\": \"An another link\"}\n+ ]]\n+ )\n+ )\n+)\n+```\n+To send a carousel:\n+```python\n+# I your message handler\n+ans(\"Hurray!\", template=template)\n+```\n\\ No newline at end of file\n"
}
] | Python | MIT License | vkbottle/vkbottle | template doc |
718,838 | 15.12.2019 19:59:01 | -10,800 | 29c37f561d9d2e89a741234f67505ba42ff2815d | awkward moment | [
{
"change_type": "MODIFY",
"old_path": "docs/template.md",
"new_path": "docs/template.md",
"diff": "## Carousel\nImport elements:\n```python\n-from vkbottler.vkbottle import template_gen, TemplateElement\n+from vkbottle import template_gen, TemplateElement\n```\n`template_gen` - create template json by the template elements\nExample:\n```python\n-from vkbottler.vkbottle import template_gen, TemplateElement, keyboard_gen\n+from vkbottle import template_gen, TemplateElement, keyboard_gen\ntemplate = template_gen(\nTemplateElement(\n\"A title\",\n"
}
] | Python | MIT License | vkbottle/vkbottle | awkward moment |
718,838 | 15.12.2019 22:24:48 | -10,800 | e80dee2d57d61d26a8476ab5acc528deab7c1d25 | add set_debug | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -77,6 +77,14 @@ class Bot(HTTP, EventProcessor):\ndef group_id(self):\nreturn self.__group_id\n+ def set_debug(self, debug: bool, **params):\n+ self.__debug = debug\n+ self._logger: Logger = Logger(\n+ debug,\n+ **params,\n+ **{k: v for k, v in self._logger.logger_params.items() if k not in params}\n+ )\n+\n@property\ndef status(self) -> BotStatus:\nreturn self._status\n"
}
] | Python | MIT License | vkbottle/vkbottle | add set_debug |
718,838 | 16.12.2019 08:05:20 | -10,800 | 64976cce9a84e267d1762e83e67dabc4df683821 | add empty_copy | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -54,6 +54,8 @@ class Bot(HTTP, EventProcessor):\nself.__loop: AbstractEventLoop = get_event_loop()\nself.__debug: bool = debug\nself.__wait = None\n+ self.__logger_opt = (plugin_folder, log_to_file, log_to)\n+ self.__vbml_patcher = vbml_patcher\nself.described_handler = DescribedHandler()\nself._status: BotStatus = BotStatus()\n@@ -85,6 +87,16 @@ class Bot(HTTP, EventProcessor):\n**{k: v for k, v in self._logger.logger_params.items() if k not in {**params, \"debug\": None}}\n)\n+ def empty_copy(self) -> super():\n+ copy = Bot(\n+ self.__token,\n+ self.__group_id,\n+ self.__debug,\n+ *self.__logger_opt,\n+ self.__vbml_patcher\n+ )\n+ return copy\n+\n@property\ndef status(self) -> BotStatus:\nreturn self._status\n"
}
] | Python | MIT License | vkbottle/vkbottle | add empty_copy |
718,838 | 16.12.2019 08:21:14 | -10,800 | b1e9b4ca5c2d1fcf4b099d113b1c57a5c6934d2f | add copy and fix | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -87,7 +87,11 @@ class Bot(HTTP, EventProcessor):\n**{k: v for k, v in self._logger.logger_params.items() if k not in {**params, \"debug\": None}}\n)\n- def empty_copy(self) -> super():\n+ def loop_update(self, loop: AbstractEventLoop = None):\n+ self.__loop = loop or get_event_loop()\n+ return self.__loop\n+\n+ def empty_copy(self) -> \"Bot\":\ncopy = Bot(\nself.__token,\nself.__group_id,\n@@ -97,6 +101,15 @@ class Bot(HTTP, EventProcessor):\n)\nreturn copy\n+ def copy(self) -> \"Bot\":\n+ bot = self.empty_copy()\n+ bot.loop_update()\n+ bot.on = self.on\n+ bot.branch = self.branch\n+ bot.error_handler = self.error_handler\n+ return bot\n+\n+\n@property\ndef status(self) -> BotStatus:\nreturn self._status\n@@ -267,3 +280,7 @@ class Bot(HTTP, EventProcessor):\n@property\ndef __dict__(self) -> dict:\nreturn self.status.readable\n+\n+ @property\n+ def eee(self):\n+ return \"We love you <3\"\n"
}
] | Python | MIT License | vkbottle/vkbottle | add copy and fix |
718,838 | 16.12.2019 20:52:30 | -10,800 | dda026ff9a7b0c4fd5b2787fe95cf2c1523a1c39 | update task_manager | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "import asyncio\nfrom .logger import keyboard_interrupt\n-from asyncio import coroutine\n-from types import CoroutineType\n-from typing import List, Callable, Coroutine\n+import typing\n\"\"\"\n@@ -31,24 +29,34 @@ SOFTWARE.\nclass TaskManager:\n+ \"\"\"\n+ Task manager represent to user high-level API of asyncio interface (Less part :))\n+ \"\"\"\n+\ndef __init__(self, loop: asyncio.AbstractEventLoop):\n- self.tasks: List[Coroutine] = []\n+ self.tasks: typing.List[typing.Callable] = []\nself.loop: asyncio.AbstractEventLoop = loop\ndef run(\nself,\n- shutdown: Callable = None,\n- startup: Callable = None,\n+ *,\n+ on_shutdown: typing.Callable = None,\n+ on_startup: typing.Callable = None,\nasyncio_debug_mode: bool = False,\n):\n\"\"\"\n- Run events\n+ Method which run event loop\n+ :param auto_reload: auto reload code when changes\n+ :param on_shutdown: coroutine which runned after complete tasks\n+ :param on_startup: coroutine which runned before start main tasks\n+ :param asyncio_debug_mode: asyncio debug mode state\n+ :return:\n\"\"\"\nif len(self.tasks) < 1:\nraise RuntimeError(\"Count of tasks - 0. Add tasks.\")\ntry:\n- if startup is not None:\n- self.loop.run_until_complete(startup())\n+ if on_startup is not None:\n+ self.loop.run_until_complete(on_startup())\nif asyncio_debug_mode:\nself.loop.set_debug(True)\n@@ -57,11 +65,12 @@ class TaskManager:\nself.loop.run_forever()\n- except KeyboardInterrupt:\n+ except:\nkeyboard_interrupt()\n+\nfinally:\n- if shutdown is not None:\n- self.loop.run_until_complete(shutdown())\n+ if on_shutdown is not None:\n+ self.loop.run_until_complete(on_shutdown())\ndef close(self):\n\"\"\"\n@@ -70,18 +79,22 @@ class TaskManager:\n\"\"\"\nself.loop.close()\n- def add_task(self, task: CoroutineType):\n+ def add_task(self, task: typing.Union[typing.Coroutine, typing.Callable]):\n\"\"\"\nAdd task to loop when loop don`t started.\n:param task: coroutine for run in loop\n:return:\n\"\"\"\n- if isinstance(task, CoroutineType):\n+ if asyncio.iscoroutinefunction(task):\n+ self.tasks.append(task())\n+ elif asyncio.iscoroutine(task):\nself.tasks.append(task)\nelse:\n- raise RuntimeError(\"Unexpected task. Tasks may be only coroutine functions\")\n+ raise RuntimeError(\n+ \"Unexpected task. Tasks may be only coroutine functions\"\n+ )\n- def run_task(self, task: Callable):\n+ def run_task(self, task: typing.Callable):\n\"\"\"\nCreate task in loop\n:param task:\n"
}
] | Python | MIT License | vkbottle/vkbottle | update task_manager |
718,838 | 16.12.2019 22:41:19 | -10,800 | beda555c2bbbac92951fc1a8e54572a33e35fc92 | lil addition | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -138,7 +138,7 @@ class Handler(object):\nclass MessageHandler:\ndef __init__(self):\n- self.inner = dict()\n+ self.inner: Dict[Payload, Dict[Callable, str, bool]] = dict()\nself.payload = PayloadHandler()\nself.prefix: list = [\"/\", \"!\"]\nself._patcher = Patcher.get_current()\n"
}
] | Python | MIT License | vkbottle/vkbottle | lil addition |
718,838 | 17.12.2019 19:47:06 | -10,800 | f259ea06d26b73763ab27166e379151649036277 | punch shlyapnov in the face | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -142,12 +142,14 @@ class Api(object):\ndata = {\"code\": code}\nreturn await self.method_object(\"\", \"\", data, _execute=True)\n- async def __call__(self, **kwargs) -> dict:\n+ async def __call__(self, *abandoned, **kwargs) -> dict:\n\"\"\"\nAPI Method Maker\n:param kwargs: all data of the request\n:return: VK Server Response\n\"\"\"\n+ if len(abandoned):\n+ raise ValueError(\"Send args with KWARGS! bot.api.a.b(a=\\\"b\\\")\")\nfor k, v in enumerate(kwargs):\nif isinstance(v, (list, tuple)):\n"
}
] | Python | MIT License | vkbottle/vkbottle | punch shlyapnov in the face |
718,838 | 18.12.2019 21:47:06 | -10,800 | d394bcff2ff1156edd53debe02d391b9ef9ae17c | update donuts
+ add set timeout possibility | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/donuts.py",
"new_path": "vkbottle/donuts.py",
"diff": "@@ -4,11 +4,18 @@ import typing\nimport asyncio\n+async def with_timeout(timeout: int, coro):\n+ await asyncio.sleep(timeout)\n+ await coro\n+\n+\nclass DonutError(Exception):\npass\nclass Donuts:\n+ def __init__(self, bot: Bot):\n+ self.bot: Bot = bot\n@staticmethod\ndef typing_state(close=False):\n\"\"\"\n@@ -33,3 +40,21 @@ class Donuts:\nreturn await func(*args, **kwargs)\nreturn wrapper\nreturn decorator\n+\n+ def with_timeout(self, timeout: int):\n+ \"\"\"\n+ Set timeout before handler performing\n+ :param timeout: timeout in seconds\n+ :return:\n+ \"\"\"\n+\n+ def decorator(func):\n+ async def wrapper(*args, **kwargs):\n+ self.bot.loop.create_task(\n+ with_timeout(timeout, func(*args, **kwargs))\n+ )\n+ return\n+ return wrapper\n+ return decorator\n+\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -2,11 +2,12 @@ from .events import Event\nfrom ..utils import dict_of_dicts_merge, Logger\nfrom inspect import signature\nfrom typing import Callable, Optional, Dict, Union\n+import typing\nfrom ..const import __version__\nfrom inspect import iscoroutinefunction\nfrom ..api import HandlerError\nimport json\n-from vbml import Patcher\n+from vbml import Patcher, Pattern\ndef should_ignore_ans(func: Callable, arguments: list) -> bool:\n@@ -31,6 +32,11 @@ class Handler(object):\nself._patcher = Patcher.get_current()\n+ if not hasattr(Pattern, \"context_copy\"):\n+ raise RuntimeError(\"\\n\\n\\tNow! Update vbml with command:\\n\"\n+ \"\\tpip install https://github.com/timoniq/vbml/archive/master.zip --upgrade\\n\"\n+ \"\\ttnx <3\")\n+\nasync def dispatch(self, get_current_rest: Callable = None) -> None:\nself.message.inner = dict_of_dicts_merge(\n@@ -138,14 +144,14 @@ class Handler(object):\nclass MessageHandler:\ndef __init__(self):\n- self.inner: Dict[Payload, Dict[Callable, str, bool]] = dict()\n+ self.inner: Dict[Pattern, Dict[dict]] = dict()\nself.payload = PayloadHandler()\nself.prefix: list = [\"/\", \"!\"]\nself._patcher = Patcher.get_current()\ndef add_handler(\nself,\n- text: str,\n+ text: typing.Union[str, Pattern],\nfunc: Callable,\ncommand: bool = False,\nlower: bool = False,\n@@ -160,6 +166,7 @@ class MessageHandler:\n:param pattern: any regex pattern pattern. {} means text which will be formatted\n:return: True\n\"\"\"\n+ if not isinstance(text, Pattern):\nprefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\npattern = self._patcher.pattern(\ntext, pattern=pattern or (\"(?i)\" if lower else \"\") + prefix + \"{}$\",\n@@ -167,8 +174,12 @@ class MessageHandler:\nself.inner[pattern] = dict(\ncall=func, ignore_ans=should_ignore_ans(func, pattern.arguments)\n)\n+ else:\n+ self.inner[self._patcher.pattern(text)] = dict(\n+ call=func, ignore_ans=should_ignore_ans(func, text.arguments)\n+ )\n- def __call__(self, text: str, command: bool = False, lower: bool = False):\n+ def __call__(self, text: typing.Union[str, Pattern], command: bool = False, lower: bool = False):\n\"\"\"\nSimple on.message(text) decorator. Support regex keys in text\n:param text: text (match case)\n@@ -177,16 +188,22 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n+ if not isinstance(text, Pattern):\nprefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\n- pattern = self._patcher.pattern(text, pattern=(\"(?i)\" if lower else \"\") + prefix + \"{}$\",)\n+ pattern = self._patcher.pattern(text, pattern=(\"(?i)\" if lower else \"\") + prefix + \"{}$\")\nself.inner[pattern] = dict(\ncall=func, ignore_ans=should_ignore_ans(func, pattern.arguments)\n)\n+ else:\n+ self.inner[self._patcher.pattern(text)] = dict(\n+ call=func,\n+ ignore_ans=should_ignore_ans(func, text.arguments)\n+ )\nreturn func\nreturn decorator\n- def startswith(self, text: str, command: bool = False, lower: bool = False):\n+ def startswith(self, text: typing.Union[str, Pattern], command: bool = False, lower: bool = False):\n\"\"\"\nStartswith regex message processor\n@@ -199,6 +216,7 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n+ if not isinstance(text, Pattern):\nprefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\npattern = self._patcher.pattern(\ntext, pattern=(\"(?i)\" if lower else \"\") + prefix + \"{}.*?\",\n@@ -206,6 +224,11 @@ class MessageHandler:\nself.inner[pattern] = dict(\ncall=func, ignore_ans=should_ignore_ans(func, pattern.arguments)\n)\n+ else:\n+ self.inner[self._patcher.pattern(text)] = dict(\n+ call=func,\n+ ignore_ans=should_ignore_ans(func, text.arguments)\n+ )\nreturn func\nreturn decorator\n"
}
] | Python | MIT License | vkbottle/vkbottle | update donuts
+ add set timeout possibility |
718,838 | 22.12.2019 10:51:19 | -10,800 | 3b1e6235a2009450b5822f88aa26af2c8324110b | update after vbml | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -12,7 +12,6 @@ from ..http import HTTP\nfrom ..api import VKError\nfrom asyncio import get_event_loop, AbstractEventLoop, TimeoutError\nfrom vbml import Patcher, PatchedValidators\n-from vbml.validators import ValidatorManager\nfrom aiohttp.client_exceptions import ClientConnectionError, ServerTimeoutError\nfrom ._event import EventTypes\nfrom .processor import EventProcessor\n@@ -61,8 +60,6 @@ class Bot(HTTP, EventProcessor):\nself.__api: Api = Api(loop=self.__loop, token=token, group_id=group_id)\nself._patcher: Patcher = vbml_patcher or Patcher()\n- if not self._patcher.manager:\n- self._patcher.add_manager(ValidatorManager(Vals))\nself._logger: Logger = Logger(\ndebug,\n"
}
] | Python | MIT License | vkbottle/vkbottle | update after vbml |
718,838 | 22.12.2019 11:56:07 | -10,800 | 5161a0e201dccf5bbd99d72a2c33fdddc12d6630 | choto update | [
{
"change_type": "MODIFY",
"old_path": "examples/bot_decorators.py",
"new_path": "examples/bot_decorators.py",
"diff": "@@ -45,11 +45,11 @@ To recognise types, import events object from vkbottle\nYou can make type-hints to work with it easier\nLike this:\n\"\"\"\n-from vkbottle.vkbottle import events\n+from vkbottle.types import GroupJoin\n@bot.on.event.group_join()\n-async def wrapper(event: events.GroupJoin):\n+async def wrapper(event: GroupJoin):\nprint('User id{} just joined the group'.format(event.user_id))\n@@ -102,4 +102,4 @@ async def wrapper(ans: Message):\nif __name__ == '__main__':\n- bot.run()\n+ bot.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -59,7 +59,7 @@ class Bot(HTTP, EventProcessor):\nself._status: BotStatus = BotStatus()\nself.__api: Api = Api(loop=self.__loop, token=token, group_id=group_id)\n- self._patcher: Patcher = vbml_patcher or Patcher()\n+ self._patcher: Patcher = vbml_patcher or Patcher(pattern=\"^{}$\")\nself._logger: Logger = Logger(\ndebug,\n@@ -192,7 +192,6 @@ class Bot(HTTP, EventProcessor):\nupdates = event.get(\"updates\", [event])\ntry:\n-\nfor update in updates:\nobj = update[\"object\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -8,6 +8,7 @@ from inspect import iscoroutinefunction\nfrom ..api import HandlerError\nimport json\nfrom vbml import Patcher, Pattern\n+from ..framework.dispatcher import Dispatcher\ndef should_ignore_ans(func: Callable, arguments: list) -> bool:\n@@ -99,7 +100,7 @@ class Handler(object):\ndef chat_mention(self):\ndef decorator(func):\npattern = self._patcher.pattern(\n- text=\"\", pattern=r\"\\[(club|public){}\\|.*?]\".format(self.__group_id)\n+ pattern=\"\", _pattern=r\"\\[(club|public){}\\|.*?]\".format(self.__group_id)\n)\nignore_ans = len(signature(func).parameters) < 1\nself.chat_message.inner[pattern] = dict(\n@@ -240,7 +241,7 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n- self.inner[self._patcher.pattern(text=\"\", pattern=pattern)] = dict(\n+ self.inner[self._patcher.pattern(\"\", pattern=pattern)] = dict(\ncall=func, ignore_ans=should_ignore_ans(func, [])\n)\nreturn func\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/__init__.py",
"new_path": "vkbottle/utils/__init__.py",
"diff": "from .task import TaskManager\nfrom .tools import dict_of_dicts_merge, flatten, folder_checkup\nfrom .logger import Logger, keyboard_interrupt\n+from .util import ContextInstanceMixin\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/utils/util.py",
"diff": "+from typing import TypeVar, Type\n+import contextvars\n+\n+T = TypeVar(\"T\")\n+\n+\n+class ContextInstanceMixin:\n+ \"\"\"\n+ Author: https://github.com/aiogram/aiogram/blob/dev-2.x/aiogram/utils/mixins.py\n+ \"\"\"\n+\n+ def __init_subclass__(cls, **kwargs):\n+ cls.__context_instance = contextvars.ContextVar(\"instance_\" + cls.__name__)\n+ return cls\n+\n+ @classmethod\n+ def get_current(cls: Type[T], no_error=True) -> T:\n+ if no_error:\n+ return cls.__context_instance.get(None)\n+ return cls.__context_instance.get()\n+\n+ @classmethod\n+ def set_current(cls: Type[T], value: T):\n+ if not isinstance(value, cls):\n+ raise TypeError(\n+ f\"Value should be instance of '{cls.__name__}' not '{type(value).__name__}'\"\n+ )\n+ cls.__context_instance.set(value)\n"
}
] | Python | MIT License | vkbottle/vkbottle | choto update |
718,838 | 29.12.2019 16:04:40 | -10,800 | 8697a199fb46d48c88a46073e11eb18c2079e1b7 | update setup and donuts
+ in_loop
+ mark_as_read | [
{
"change_type": "MODIFY",
"old_path": "setup.py",
"new_path": "setup.py",
"diff": "import setuptools\n+try:\n+ with open('README.md', 'r', encoding=\"utf-8\") as f:\n+ long_description = f.read()\n+except:\nwith open('README.md', 'r') as f:\nlong_description = f.read()\n+\nsetuptools.setup(\nname=\"vkbottle\",\nversion=\"1.33\",\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/donuts.py",
"new_path": "vkbottle/donuts.py",
"diff": "@@ -16,8 +16,25 @@ class DonutError(Exception):\nclass Donuts:\ndef __init__(self, bot: Bot):\nself.bot: Bot = bot\n- @staticmethod\n- def typing_state(close=False):\n+\n+ def in_loop(self, loop: int):\n+ \"\"\"\n+ Make loops..\n+ :param loop:\n+ :return:\n+ \"\"\"\n+ def decorator(func):\n+ async def wrapper(*args, **kwargs):\n+ print(args, kwargs)\n+ for iteration in range(0, loop):\n+ self.bot.loop.create_task(\n+ func(*args, **kwargs)\n+ )\n+ return\n+ return wrapper\n+ return decorator\n+\n+ def typing_state(self):\n\"\"\"\nSet typing state during the function is performing\n:param close:\n@@ -25,13 +42,8 @@ class Donuts:\n\"\"\"\ndef decorator(func):\nasync def wrapper(*args, **kwargs):\n- args: typing.List[Message] = [\n- ans for ans in args if type(ans) is Message\n- ]\n- if not len(args):\n- raise DonutError(\"Function should contain Message argument\")\n- await args[0].api[0].request(\n+ await self.bot.api.request(\n\"messages\",\n\"setActivity\",\n{\"user_id\": args[0].peer_id, \"type\": \"typing\"},\n@@ -57,4 +69,23 @@ class Donuts:\nreturn wrapper\nreturn decorator\n+ def mark_as_read(self):\n+ \"\"\"\n+ Mark message as read\n+ :return:\n+ \"\"\"\n+ def decorator(func):\n+ async def wrapper(*args, **kwargs):\n+ await self.bot.api.request(\n+ \"messages\",\n+ \"markAsRead\",\n+ {\n+ \"start_message_id\": args[0].id,\n+ \"peer_id\": args[0].peer_id\n+ },\n+ )\n+\n+ return await func(*args, **kwargs)\n+ return wrapper\n+ return decorator\n"
}
] | Python | MIT License | vkbottle/vkbottle | update setup and donuts
+ in_loop
+ mark_as_read |
718,838 | 01.01.2020 17:20:38 | -10,800 | d485849210e13d5de329253daa236c2938f372b4 | add change_handler_return_context | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "vkbottle/framework/_status.py",
"diff": "+class BotStatus:\n+ polling_started: bool = False\n+ dispatched: bool = False\n+ handler_return_context: dict = {}\n+\n+ @property\n+ def readable(self) -> dict:\n+ return {\"polling_started\": self.polling_started,\n+ \"dispatched\": self.dispatched}\n+\n+ def change_handler_return_context(\n+ self,\n+ attachment: str = None,\n+ keyboard: dict = None,\n+ template: dict = None,\n+ **params\n+ ):\n+ local = locals()\n+ local.pop(\"self\")\n+ self.handler_return_context = {k: v for k, v in local.items() if\n+ v is not None}\n+ return self.handler_return_context\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -18,6 +18,7 @@ from .processor import EventProcessor\nfrom .branch import BranchManager\nfrom ..utils.tools import folder_checkup\nimport traceback\n+from ._status import BotStatus\nDEFAULT_WAIT = 20\n@@ -27,15 +28,6 @@ class Vals(PatchedValidators):\npass\n-class BotStatus:\n- polling_started: bool = False\n- dispatched: bool = False\n-\n- @property\n- def readable(self) -> dict:\n- return {\"polling_started\": self.polling_started, \"dispatched\": self.dispatched}\n-\n-\nclass Bot(HTTP, EventProcessor):\ndef __init__(\nself,\n@@ -105,7 +97,6 @@ class Bot(HTTP, EventProcessor):\nbot.error_handler = self.error_handler\nreturn bot\n-\n@property\ndef status(self) -> BotStatus:\nreturn self._status\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -10,6 +10,7 @@ from .branch import Branch, ExitBranch\nfrom vbml import Pattern, Patcher\nimport typing\nimport json\n+from ._status import BotStatus\ndef get_attr(adict: dict, attrs: typing.List[str]):\n@@ -32,6 +33,7 @@ class EventProcessor(RegexHelper):\non: Handler\npatcher: Patcher\nbranch: BranchManager\n+ status: BotStatus\ngroup_id: int\n_logger: Logger\n__loop: AbstractEventLoop\n@@ -260,7 +262,8 @@ class EventProcessor(RegexHelper):\nself.branch.exit(obj[\"peer_id\"])\nelif return_type in [str, int, dict, list, tuple, float]:\nawait Message(**obj, api=[self.api], client_info=client_info)(\n- str(handler_return)\n+ str(handler_return),\n+ **self.status.handler_return_context\n)\nelif handler_return is not None:\nraise HandlerReturnError(\n"
}
] | Python | MIT License | vkbottle/vkbottle | add change_handler_return_context |
718,838 | 20.01.2020 19:13:58 | -10,800 | f904569cdb0b3b1902dd04d7312d16306468b388 | help to 3.6 python | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/logger.py",
"new_path": "vkbottle/utils/logger.py",
"diff": "@@ -110,6 +110,6 @@ class Logger(object):\nprint(self.__coloring(\" \".join([str(i) for i in some]), \"red\"))\n-def keyboard_interrupt() -> typing.NoReturn:\n+def keyboard_interrupt() -> None:\nprint(Coloring(\"VKBottle\")(\"Keyboard Interrupt\", color=\"yellow\"))\nexit(0)\n"
}
] | Python | MIT License | vkbottle/vkbottle | help to 3.6 python |
718,838 | 23.01.2020 21:32:34 | -10,800 | e7279f8ca1006eec4c57544530cd09b25880c523 | v1 Rules fixes and docs | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -51,7 +51,7 @@ class EventProcessor(RegexHelper):\nif all([rule.check(message) for rule in rules]):\nargs = [a for rule in rules for a in rule.context.args]\nkwargs = {k: v for rule in rules for k, v in rule.context.kwargs.items()}\n- if rules[0].data.get(\"ignore_ans\") is False:\n+ if not rules[0].data.get(\"ignore_ans\"):\nargs = [message, *args]\ntask = await rules[0].call(*args, **kwargs)\n@@ -97,7 +97,7 @@ class EventProcessor(RegexHelper):\nargs = [a for rule in rules for a in rule.context.args]\nkwargs = {k: v for rule in rules for k, v in\nrule.context.kwargs.items()}\n- if rules[0].data.get(\"ignore_ans\") is False:\n+ if not rules[0].data.get(\"ignore_ans\"):\nargs = [message, *args]\nself._logger.debug(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/__init__.py",
"new_path": "vkbottle/framework/rule/__init__.py",
"diff": "-from .rule import (\n- AbstractRule,\n- AbstractMessageRule,\n- VBMLRule,\n- AttachmentRule,\n- ChatActionRule,\n- PayloadRule,\n- EventRule,\n-)\n+from .rule import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -31,6 +31,34 @@ class AbstractMessageRule(AbstractRule):\n...\n+class UnionMixin(AbstractMessageRule):\n+ def __init__(self, mixin=None):\n+ mixin = mixin if mixin is not None else []\n+ if not isinstance(mixin, list):\n+ mixin = [mixin]\n+ self.data[\"mixin\"] = mixin\n+\n+\n+class StickerRule(UnionMixin):\n+ def check(self, message: Message):\n+ if len(message.attachments) and message.attachments[0].sticker:\n+ if not len(self.data[\"mixin\"]):\n+ return True\n+ if message.attachments[0].sticker.sticker_id in self.data[\"mixin\"]:\n+ return True\n+\n+\n+class MessageRule(AbstractMessageRule):\n+ def __init__(self, message: typing.Union[str, typing.List[str]]):\n+ if isinstance(message, str):\n+ message = [message]\n+ self.data[\"message\"] = message\n+\n+ def check(self, message: Message):\n+ if message.text in self.data[\"message\"]:\n+ return True\n+\n+\nclass EventRule(AbstractRule):\ndef __init__(self, event: typing.Union[str, typing.List[str]]):\nif isinstance(event, str):\n@@ -73,21 +101,16 @@ class VBMLRule(AbstractMessageRule):\nreturn True\n-class AttachmentRule(AbstractMessageRule):\n- def __init__(self, attachment: typing.Union[str, typing.List[str]] = None):\n- if isinstance(attachment, str):\n- attachment = [attachment]\n- self.data[\"type\"] = attachment or []\n-\n+class AttachmentRule(UnionMixin):\ndef check(self, message: Message):\nattachments = [\nlist(attachment.dict(skip_defaults=True).keys())[0]\nfor attachment in message.attachments\n]\n- if len(attachments) and not len(self.data[\"type\"]):\n+ if len(attachments) and not len(self.data[\"mixin\"]):\n# ANY ATTACHMENTS\nreturn True\n- for attachment_type in self.data.get(\"type\", []):\n+ for attachment_type in self.data.get(\"mixin\", []):\nif attachment_type in attachments:\nreturn True\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/events.py",
"new_path": "vkbottle/handler/events.py",
"diff": "@@ -22,6 +22,14 @@ class Event(object):\nreturn decorator\n+ def rule(self, rule):\n+ def decorator(func):\n+ rule.create(func)\n+ self.rules.append(rule)\n+ return func\n+\n+ return decorator\n+\ndef message_reply(self):\ndef decorator(func):\nrule = EventRule(EventList.MESSAGE_REPLY)\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Rules fixes and docs |
718,838 | 24.01.2020 18:15:12 | -10,800 | 70bdde077d7437dffd1bebe2a6a3b4350ccbbee1 | v1 Rules Fix | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -12,14 +12,14 @@ class RuleExecute:\nclass AbstractRule:\ndef __init_subclass__(cls, **kwargs):\n- cls.data: dict = {}\ncls.call: typing.Optional[typing.Callable] = None\ncls.context: RuleExecute = RuleExecute()\ndef create(self, func: typing.Callable, data: dict = None):\nself.call: typing.Callable = func\nself.context = RuleExecute()\n- self.data.update(data or {})\n+ if data is not None:\n+ setattr(self, \"data\", {**getattr(self, \"data\", {}), **data})\n...\ndef check(self, event):\n@@ -36,7 +36,7 @@ class UnionMixin(AbstractMessageRule):\nmixin = mixin if mixin is not None else []\nif not isinstance(mixin, list):\nmixin = [mixin]\n- self.data[\"mixin\"] = mixin\n+ self.data = {\"mixin\": mixin}\nclass StickerRule(UnionMixin):\n@@ -52,7 +52,7 @@ class MessageRule(AbstractMessageRule):\ndef __init__(self, message: typing.Union[str, typing.List[str]]):\nif isinstance(message, str):\nmessage = [message]\n- self.data[\"message\"] = message\n+ self.data = {\"message\": message}\ndef check(self, message: Message):\nif message.text in self.data[\"message\"]:\n@@ -63,12 +63,12 @@ class EventRule(AbstractRule):\ndef __init__(self, event: typing.Union[str, typing.List[str]]):\nif isinstance(event, str):\nevent = [event]\n- self.data[\"event\"] = event\n+ self.data = {\"event\": event}\ndef check(self, event):\nfor e in self.data[\"event\"]:\nif \"data\" not in self.data:\n- self.data[\"data\"] = dict\n+ self.data = {\"data\": dict}\nif e == event:\nreturn True\n@@ -90,7 +90,7 @@ class VBMLRule(AbstractMessageRule):\nelif isinstance(pattern, str):\npatterns = [Patcher.get_current().pattern(pattern)]\n- self.data[\"pattern\"] = patterns\n+ self.data = {\"pattern\": patterns}\ndef check(self, message: Message):\npatterns: typing.List[Pattern] = self.data[\"pattern\"]\n@@ -121,6 +121,7 @@ class ChatActionRule(AbstractMessageRule):\n):\nif isinstance(chat_action, str):\nchat_action = [chat_action]\n+ self.data = dict()\nself.data[\"chat_action\"] = chat_action\nself.data[\"rules\"] = rules or {}\n@@ -136,6 +137,7 @@ class ChatActionRule(AbstractMessageRule):\nclass PayloadRule(AbstractMessageRule):\ndef __init__(self, payload: dict, mode=1):\n+ self.data = dict()\nself.data[\"payload\"] = payload\nself.data[\"mode\"] = mode\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Rules Fix #16 |
718,889 | 25.01.2020 16:51:45 | -18,000 | b661755f83eef2bc0c374d5015485987b7e7db39 | VBMLRule Fix | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -78,17 +78,18 @@ class VBMLRule(AbstractMessageRule):\nself,\npattern: typing.Union[str, Pattern, typing.List[typing.Union[str, Pattern]]],\n):\n+ self._patcher = Patcher.get_current()\npatterns: typing.List[Pattern] = []\nif isinstance(pattern, Pattern):\npatterns = [pattern]\nelif isinstance(pattern, list):\nfor p in pattern:\nif isinstance(p, str):\n- patterns.append(Patcher.get_current().pattern(p))\n+ patterns.append(self._patcher.pattern(p))\nelse:\npatterns.append(p)\nelif isinstance(pattern, str):\n- patterns = [Patcher.get_current().pattern(pattern)]\n+ patterns = [self._patcher.pattern(pattern)]\nself.data = {\"pattern\": patterns}\n@@ -96,7 +97,7 @@ class VBMLRule(AbstractMessageRule):\npatterns: typing.List[Pattern] = self.data[\"pattern\"]\nfor pattern in patterns:\n- if pattern(message.text):\n+ if self._patcher.check(message.text, pattern):\nself.context.kwargs = pattern.dict()\nreturn True\n"
}
] | Python | MIT License | vkbottle/vkbottle | VBMLRule Fix (#17) |
718,838 | 26.01.2020 12:02:41 | -10,800 | eaba800a04bb8db00a26fb89a31327ac50060f28 | Concatenating functions | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -66,6 +66,10 @@ class Bot(HTTP, EventProcessor):\nself.on: Handler = Handler(self._logger, group_id)\nself.error_handler: ErrorHandler = ErrorHandler()\n+ def dispatch(self, ext: \"Bot\"):\n+ self.on.concatenate(ext.on)\n+ self.error_handler.update(ext.error_handler.processors)\n+\n@property\ndef group_id(self):\nreturn self.__group_id\n@@ -232,8 +236,8 @@ class Bot(HTTP, EventProcessor):\nexcept VKError as e:\ne = list(e.args)[0]\n- if e[0] in self.error_handler.get_processor():\n- handler = self.error_handler.get_processor()[e[0]][\"call\"]\n+ if e[0] in self.error_handler.processors:\n+ handler = self.error_handler.processors[e[0]][\"call\"]\nself._logger.debug(\n\"VKError ?{}! Processing it with handler <{}>\".format(\ne, handler.__name__\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/error.py",
"new_path": "vkbottle/handler/error.py",
"diff": "@@ -10,5 +10,9 @@ class ErrorHandler(object):\nreturn decorator\n- def get_processor(self):\n+ @property\n+ def processors(self):\nreturn self._error_processors\n+\n+ def update(self, processors: dict):\n+ self._error_processors.update(processors)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "from .events import Event\n-from ..utils import dict_of_dicts_merge, Logger\n+from ..utils import Logger\nfrom inspect import signature\nimport typing\nfrom ..const import __version__\nfrom inspect import iscoroutinefunction\nfrom ..api import HandlerError\nimport re\n-\n-\nfrom ..framework.rule import AbstractRule, VBMLRule, ChatActionRule, PayloadRule\nfrom vbml import Patcher, Pattern\n@@ -30,7 +28,6 @@ class Handler(object):\nself._pre_p: typing.Optional[typing.Callable] = None\nself.__undefined_message_func = None\n- self.__chat_action_types: list = list()\nself._patcher = Patcher.get_current()\nif not hasattr(Pattern, \"context_copy\"):\n@@ -40,17 +37,32 @@ class Handler(object):\n\"\\ttnx <3\"\n)\n+ def concatenate(self, handler: \"Handler\"):\n+ \"\"\"\n+ Concatenate handlers from current handler and another handler\n+ :param handler: another handler\n+ :return:\n+ \"\"\"\n+ self.message.concatenate(handler.message)\n+ self.chat_message.concatenate(handler.chat_message)\n+ self.message_both.concatenate(handler.message_both)\n+ self.event.rules += handler.event.rules\n+\n+ if self.pre is None:\n+ self._pre_p = handler.pre\n+\nasync def dispatch(self, get_current_rest: typing.Callable = None) -> None:\n+ \"\"\"\n+ Dispatch handlers from only-handlers and both-handlers\n+ :param get_current_rest: REST from vkbottle-rest\n+ :return:\n+ \"\"\"\n- self.message.rules = self.message.rules + self.message_both.rules\n- self.chat_message.rules = self.chat_message.rules + self.message_both.rules\n+ self.message.rules += self.message_both.rules\n+ self.chat_message.rules += self.message_both.rules\n- self.message.payload.rules = (\n- self.message.payload.rules + self.message_both.payload.rules\n- )\n- self.chat_message.payload.rules = (\n- self.chat_message.payload.rules + self.message_both.payload.rules\n- )\n+ self.message.payload.rules += self.message_both.payload.rules\n+ self.chat_message.payload.rules += self.message_both.payload.rules\nif get_current_rest:\n@@ -124,10 +136,6 @@ class Handler(object):\ndef undefined_func(self):\nreturn self.__undefined_message_func\n- @property\n- def chat_action_types(self):\n- return self.__chat_action_types\n-\n@property\ndef pre(self):\nreturn self._pre_p\n@@ -147,6 +155,11 @@ class MessageHandler:\nself.prefix: list = [\"/\", \"!\"]\nself._patcher = Patcher.get_current()\n+ def concatenate(self, message_handler: \"MessageHandler\"):\n+ self.rules += message_handler.rules\n+ self.prefix += [p for p in message_handler.prefix if p not in self.prefix]\n+ self.payload.rules += message_handler.payload.rules\n+\ndef add_handler(\nself,\nfunc: typing.Callable,\n"
}
] | Python | MIT License | vkbottle/vkbottle | Concatenating functions |
718,889 | 28.01.2020 19:02:54 | -18,000 | a3da75b61076772f327db279c8f3444917575ca2 | Rules <check> now async | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -48,7 +48,7 @@ class EventProcessor(RegexHelper):\n)\nfor rules in [*self.on.message.payload.rules, *self.on.message.rules]:\n- if all([rule.check(message) for rule in rules]):\n+ if all([await rule.check(message) for rule in rules]):\nargs = [a for rule in rules for a in rule.context.args]\nkwargs = {k: v for rule in rules for k, v in rule.context.kwargs.items()}\nif not rules[0].data.get(\"ignore_ans\"):\n@@ -92,7 +92,7 @@ class EventProcessor(RegexHelper):\nawait (self.on.pre(message))\nfor rules in [*self.on.chat_message.payload.rules, *self.on.chat_message.rules]:\n- if all([rule.check(message) for rule in rules]):\n+ if all([await rule.check(message) for rule in rules]):\nargs = [a for rule in rules for a in rule.context.args]\nkwargs = {k: v for rule in rules for k, v in\nrule.context.kwargs.items()}\n@@ -129,7 +129,7 @@ class EventProcessor(RegexHelper):\n)\nfor rule in self.on.event.rules:\n- if rule.check(event_type):\n+ if await rule.check(event_type):\nevent = rule.data[\"data\"](**obj)\nawait rule.call(event, *rule.context.args, **rule.context.kwargs)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -22,12 +22,12 @@ class AbstractRule:\nsetattr(self, \"data\", {**getattr(self, \"data\", {}), **data})\n...\n- def check(self, event):\n+ async def check(self, event):\n...\nclass AbstractMessageRule(AbstractRule):\n- def check(self, message: Message):\n+ async def check(self, message: Message):\n...\n@@ -40,7 +40,7 @@ class UnionMixin(AbstractMessageRule):\nclass StickerRule(UnionMixin):\n- def check(self, message: Message):\n+ async def check(self, message: Message):\nif len(message.attachments) and message.attachments[0].sticker:\nif not len(self.data[\"mixin\"]):\nreturn True\n@@ -54,7 +54,7 @@ class MessageRule(AbstractMessageRule):\nmessage = [message]\nself.data = {\"message\": message}\n- def check(self, message: Message):\n+ async def check(self, message: Message):\nif message.text in self.data[\"message\"]:\nreturn True\n@@ -65,7 +65,7 @@ class EventRule(AbstractRule):\nevent = [event]\nself.data = {\"event\": event}\n- def check(self, event):\n+ async def check(self, event):\nfor e in self.data[\"event\"]:\nif \"data\" not in self.data:\nself.data = {\"data\": dict}\n@@ -79,13 +79,13 @@ class UserLongPollEventRule(AbstractRule):\nevent = [event]\nself.data = {\"event\": event, \"rules\": rules}\n- def check(self, update):\n+ async def check(self, update):\nfor e in self.data[\"event\"]:\nif e == update[0]:\nif not len(self.data[\"rules\"]):\nreturn True\nfor rule in self.data[\"rules\"]:\n- if rule.check(update):\n+ if await rule.check(update):\nself.context = rule.context\nreturn True\n@@ -110,7 +110,7 @@ class VBMLRule(AbstractMessageRule):\nself.data = {\"pattern\": patterns}\n- def check(self, message: Message):\n+ async def check(self, message: Message):\npatterns: typing.List[Pattern] = self.data[\"pattern\"]\nfor pattern in patterns:\n@@ -120,7 +120,7 @@ class VBMLRule(AbstractMessageRule):\nclass AttachmentRule(UnionMixin):\n- def check(self, message: Message):\n+ async def check(self, message: Message):\nattachments = [\nlist(attachment.dict(skip_defaults=True).keys())[0]\nfor attachment in message.attachments\n@@ -143,7 +143,7 @@ class ChatActionRule(AbstractMessageRule):\nself.data[\"chat_action\"] = chat_action\nself.data[\"rules\"] = rules or {}\n- def check(self, message: Message):\n+ async def check(self, message: Message):\nif message.action:\nif message.action.type in self.data[\"chat_action\"]:\nif {\n@@ -166,7 +166,7 @@ class PayloadRule(AbstractMessageRule):\nexcept json.decoder.JSONDecodeError:\nreturn dict()\n- def check(self, message: Message):\n+ async def check(self, message: Message):\nif message.payload is not None:\npayload = self.dispatch(message.payload)\nif self.data[\"mode\"] == 1:\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "@@ -96,7 +96,7 @@ class User(HTTP):\nfor update in event.get(\"updates\", []):\nupdate_fields = update[1:]\nfor rule in self.on.rules:\n- if rule.check(update):\n+ if await rule.check(update):\nfields, name = rule.data[\"data\"], rule.data[\"name\"]\ndata = dict(zip(fields, update_fields))\nif rule.data.get(\"dataclass\"):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -215,7 +215,13 @@ class MessageHandler:\ndef rule(self, *rules):\ndef decorator(func):\n- self.rules.append([rule.create(func) for rule in rules])\n+ current: typing.List[AbstractRule] = list()\n+\n+ for rule in rules:\n+ rule.create(func)\n+ current.append(rule)\n+\n+ self.rules.append(current)\nreturn func\nreturn decorator\n"
}
] | Python | MIT License | vkbottle/vkbottle | Rules <check> now async (#19) |
718,838 | 28.01.2020 17:34:56 | -10,800 | 0c0478c9a49340296315c0b9f97f9ae100d4dfea | v1 TaskManager Fix
+ docs | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/task_manager.md",
"diff": "+# TaskManager\n+\n+Import:\n+\n+```python\n+from vkbottle import TaskManager\n+manager = TaskManager() # if you don't have running loop\n+manager = TaskManager(bot.loop) # if you have initialized bot\n+# ...\n+```\n+\n+Use of manager:\n+\n+`manager.add_task(task: Coroutine or Callable)` - add task to the queue, queue can be started with `manager.run()`\n+\n+`manager.run_task(task: Coroutine or Callable)` - run task, ignore queue\n+\n+`manager.run()` - run tasks in queue in `loop.run_forever`\n+\n+`manager.close()` - close event loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "@@ -113,3 +113,7 @@ class User(HTTP):\ndef mode(self, mode: int):\nself._mode = mode\nself.on.mode = mode\n+\n+ @property\n+ def loop(self):\n+ return self.__loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "@@ -33,9 +33,9 @@ class TaskManager:\nTask manager represent to user high-level API of asyncio interface (Less part :))\n\"\"\"\n- def __init__(self, loop: asyncio.AbstractEventLoop):\n+ def __init__(self, loop: asyncio.AbstractEventLoop = None):\nself.tasks: typing.List[typing.Callable] = []\n- self.loop: asyncio.AbstractEventLoop = loop\n+ self.loop: asyncio.AbstractEventLoop = loop or asyncio.get_event_loop()\ndef run(\nself,\n@@ -92,11 +92,17 @@ class TaskManager:\nelse:\nraise RuntimeError(\"Unexpected task. Tasks may be only coroutine functions\")\n- def run_task(self, task: typing.Callable):\n+ def run_task(self, task: typing.Union[typing.Coroutine, typing.Callable]):\n\"\"\"\nCreate task in loop\n:param task:\n:return:\n\"\"\"\n+ if asyncio.iscoroutinefunction(task):\nself.loop.create_task(task())\n+ elif asyncio.iscoroutine(task):\n+ self.loop.create_task(task)\n+ else:\n+ raise RuntimeError(\n+ \"Unexpected task. Tasks may be only coroutine functions\")\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 TaskManager Fix
+ docs |
718,838 | 28.01.2020 20:28:11 | -10,800 | 1618ed6a96637a2d174ffd8255b4614a8cc22c01 | v1 User LP Fixes | [
{
"change_type": "MODIFY",
"old_path": "docs/RulesExecutor.md",
"new_path": "docs/RulesExecutor.md",
"diff": "@@ -63,7 +63,7 @@ class MyFirstRule(AbstractRule):\ndef __init__(self, count: int):\nself.data[\"c\"] = count\n- def check(self, message: Message):\n+ async def check(self, message: Message):\nif len(message.text.split()) == self.data[\"c\"]:\nreturn True\n```\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "-from ...types import Message\n+from ...types import Message, BaseModel\n+from ...types import user_longpoll\nfrom vbml import Pattern, Patcher\nimport typing\nimport json\n@@ -9,6 +10,9 @@ class RuleExecute:\nself.args = []\nself.kwargs = {}\n+ def __call__(self):\n+ return self.args, self.kwargs\n+\nclass AbstractRule:\ndef __init_subclass__(cls, **kwargs):\n@@ -26,6 +30,11 @@ class AbstractRule:\n...\n+class AbstractUserRule(AbstractRule):\n+ async def check(self, update: typing.Tuple[dict, BaseModel]):\n+ ...\n+\n+\nclass AbstractMessageRule(AbstractRule):\nasync def check(self, message: Message):\n...\n@@ -84,13 +93,16 @@ class UserLongPollEventRule(AbstractRule):\nif e == update[0]:\nif not len(self.data[\"rules\"]):\nreturn True\n- for rule in self.data[\"rules\"]:\n- if await rule.check(update):\n- self.context = rule.context\n+ return tuple(self.data[\"rules\"])\n+\n+\n+class UserMessageRule(AbstractUserRule, UnionMixin):\n+ async def check(self, message: user_longpoll.Message):\n+ if message.text in self.data[\"mixin\"]:\nreturn True\n-class VBMLRule(AbstractMessageRule):\n+class VBML:\ndef __init__(\nself,\npattern: typing.Union[str, Pattern, typing.List[typing.Union[str, Pattern]]],\n@@ -110,6 +122,8 @@ class VBMLRule(AbstractMessageRule):\nself.data = {\"pattern\": patterns}\n+\n+class VBMLRule(AbstractMessageRule, VBML):\nasync def check(self, message: Message):\npatterns: typing.List[Pattern] = self.data[\"pattern\"]\n@@ -119,6 +133,16 @@ class VBMLRule(AbstractMessageRule):\nreturn True\n+class VBMLUserRule(AbstractUserRule, VBML):\n+ async def check(self, message: user_longpoll.Message):\n+ patterns: typing.List[Pattern] = self.data[\"pattern\"]\n+\n+ for pattern in patterns:\n+ if self._patcher.check(message.text, pattern) is not None:\n+ self.context.kwargs = pattern.dict()\n+ return True\n+\n+\nclass AttachmentRule(UnionMixin):\nasync def check(self, message: Message):\nattachments = [\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "@@ -96,12 +96,25 @@ class User(HTTP):\nfor update in event.get(\"updates\", []):\nupdate_fields = update[1:]\nfor rule in self.on.rules:\n- if await rule.check(update):\n+ check = await rule.check(update)\n+ if check is not None:\nfields, name = rule.data[\"data\"], rule.data[\"name\"]\ndata = dict(zip(fields, update_fields))\n+ args, kwargs = [], {}\nif rule.data.get(\"dataclass\"):\ndata = rule.data.get(\"dataclass\")(**data)\n- await rule.call(data, *rule.context.args, **rule.context.kwargs)\n+ if isinstance(check, tuple):\n+ if all([await s_rule.check(data) for s_rule in check]):\n+ args = (\n+ [a for rule in check for a in rule.context.args]\n+ )\n+ kwargs = (\n+ {k: v for rule in check for k, v in rule.context.kwargs.items()}\n+ )\n+ else:\n+ continue\n+\n+ await rule.call(data, *args, **kwargs)\ndef run_polling(self):\nloop = self.__loop\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 User LP Fixes |
718,838 | 28.01.2020 21:22:41 | -10,800 | 749dbdc932de88aaaef321f0e9a2b5601dc933b7 | v1 Fix Attachments | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll.py",
"new_path": "vkbottle/types/user_longpoll.py",
"diff": "@@ -12,7 +12,7 @@ class Message(BaseModel):\npeer_id: int = None\ntimestamp: int = None\ntext: str = None\n- attachments: list = None\n+ attachments: dict = None\nrandom_id: int = None\nasync def reply(\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Fix Attachments |
718,838 | 28.01.2020 22:29:51 | -10,800 | 09d70f6eb30b90c78210e49d1c82821d656d7632 | v1 Arranged docs | [
{
"change_type": "MODIFY",
"old_path": "examples/bot_decorators.py",
"new_path": "examples/bot_decorators.py",
"diff": "@@ -2,32 +2,33 @@ from vkbottle import Bot, Message\nbot = Bot(token=\"token\", group_id=1, debug=True)\n-\"\"\"Bot functions\n+\"\"\"\n+Bot functions\nDescribed in code comments\n\"\"\"\n# STANDART HANDLERS\n-@bot.on.message(\"hi\")\n+@bot.on.message(text=\"hi\")\nasync def wrapper(ans: Message):\n# Works if message 'hi' in private dialog is received\nawait ans(\"hi\")\n-@bot.on.chat_message(\"banana\")\n+@bot.on.chat_message(text=\"banana\")\nasync def wrapper(ans: Message):\n# Works if message 'banana' in chat received\nawait ans(\"clean me..\")\n-@bot.on.message_both(\"apple\")\n+@bot.on.message_both(text=\"apple\")\nasync def wrapper(ans: Message):\n# Works if message 'apple' in both (chat or private) dialog received\nawait ans(\"steve jobs..((((\")\n-@bot.on.chat_message.startswith(\"/start\")\n+@bot.on.chat_message.startswith(text=\"/start\")\nasync def wrapper(ans: Message):\n# Works if message in chat starts with '/start'\nawait ans(\"this message starts with /start, yes?\")\n@@ -36,7 +37,7 @@ async def wrapper(ans: Message):\n@bot.on.message_both.regex(\".*?sad.*?\")\nasync def wrapper(ans: Message):\n# Works if regex match r'.*?sad.*?' is True\n- await ans(\"sadness, im sad, sadistic. its all in my own!\")\n+ await ans(\"sadness, im sad, sadistic. its all on my own!\")\n# EVENT HANDLER\n@@ -74,13 +75,13 @@ Arguments in these instances are not separable!\n\"\"\"\n-@bot.on.message(\"+<country_code>(<state_code>)<number>\")\n+@bot.on.message(text=\"+<country_code>(<state_code>)<number>\")\nasync def wrapper(ans: Message, country_code, state_code, number):\n# +0(123)456\nif country_code.isdigit() and state_code.isdigit() and number.isdigit():\n- await ans(\"Number inputted correctly!\")\n+ await ans(\"Well done!\")\nelse:\n- await ans(\"Number has been inputted incorrectly!\")\n+ await ans(\"Number is incorrect!\")\n# OPTIONAL HANDLERS\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/callback_bot.py",
"new_path": "examples/callback_bot.py",
"diff": "-from vkbottle import Message, Bot, keyboard_gen\n-from flask import request, Flask\n-import sys\n+from vkbottle import Bot, Message\n+from aiohttp.web import RouteTableDef, Application, Request, run_app\n-app = Flask(__name__)\n-bot = Bot(token=open(\"token\").readline(), group_id=1, debug=True,)\n-confirmation = \"MyConfirmation\"\n-keyboard = keyboard_gen(\n- [\n- [{\"text\": \"do $ex\"}, {\"text\": \"make me con\", \"color\": \"negative\"}],\n- [{\"text\": \"cry..\"}],\n- ],\n- one_time=True,\n-)\n+app = Application()\n+routes = RouteTableDef()\n+bot = Bot('my-token', 123, debug=True, secret=\"SecretKey\")\n-@app.route(\"/bot\")\n-def route():\n- event = request.get_json(force=True, silent=True)\n- return bot.process(event, confirmation_token=confirmation)\n+@routes.get('/bot')\n+async def executor(request: Request):\n+ return await bot.emulate(event=dict(request.query), confirmation_token=\"ConfirmationToken\")\n-@bot.on.message_both.lower(\"hi <name>\")\n-async def wrapper(ans: Message, name):\n- await ans(f\"i'm not a {name}\", keyboard=keyboard)\n+@bot.on.message(text='test', lower=True)\n+async def wrapper():\n+ return \"test\"\n+\n+app.add_routes(routes)\n+run_app(app)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/user_longpoll.py",
"diff": "+from vkbottle.user import User\n+from vkbottle.user.types import Message\n+from vkbottle.rule import VBMLUserRule\n+\n+user = User(\"user-token\", 123)\n+user.mode(8)\n+\n+\n+@user.on.message_new(VBMLUserRule(\"hi, <name>\"))\n+async def wrapper(ans: Message, name):\n+ await ans(f\"I'm not a {name}!\")\n+\n+\n+@user.on.message_read_out()\n+async def call(event: dict):\n+ await user.api.request(\"messages.send\",\n+ {\"message\": \"Ye! You finally read it!\",\n+ \"peer_id\": event[\"peer_id\"],\n+ \"random_id\": 0})\n+\n+user.run_polling()\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Arranged docs |
718,838 | 29.01.2020 22:39:32 | -10,800 | 9b18a19d4d23e244731cce8d247e0aeb95cec34f | v1 Fix docs because of the pressure | [
{
"change_type": "MODIFY",
"old_path": "docs/template.md",
"new_path": "docs/template.md",
"diff": "@@ -9,6 +9,7 @@ from vkbottle import template_gen, TemplateElement\nExample:\n```python\nfrom vkbottle import template_gen, TemplateElement, keyboard_gen\n+\ntemplate = template_gen(\nTemplateElement(\n\"A title\",\n@@ -37,5 +38,5 @@ template = template_gen(\nTo send a carousel:\n```python\n# I your message handler\n-ans(\"Hurray!\", template=template)\n+await ans(\"Hurray!\", template=template)\n```\n\\ No newline at end of file\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Fix docs because of the pressure |
718,838 | 31.01.2020 17:29:47 | -10,800 | 062f2ff3d421a4e08b883fdced0f6d70b58a6259 | v1 Fix Patcher | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "import typing\nfrom asyncio import get_event_loop, AbstractEventLoop\n-import aiohttp\n+import aiohttp, vbml\nfrom ..http import HTTP\nfrom ..api import UserApi\n@@ -29,12 +29,14 @@ class User(HTTP):\nplugin_folder: str = None,\nmode: int = None,\nlog_to_file: bool = False,\n+ vbml_patcher: vbml.Patcher = None,\n):\nself.__loop: AbstractEventLoop = get_event_loop()\nself.__debug: bool = debug\nself.__api: UserApi = UserApi(token)\nUserApi.set_current(self.__api)\nself._mode = mode\n+ self._patcher: vbml.Patcher = vbml_patcher or vbml.Patcher(pattern=\"^{}$\")\nself.user_id: typing.Optional[int] = user_id\nself.on: UserHandler = UserHandler(self._mode)\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Fix Patcher |
718,838 | 01.02.2020 23:17:11 | -10,800 | 1337b45e9286f61785443f44fbf5c5d533833077 | v1 Change Rules again | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/__init__.py",
"new_path": "vkbottle/__init__.py",
"diff": "@@ -4,4 +4,3 @@ from .utils.task import TaskManager\nfrom .api import template_gen, TemplateElement\nfrom .api.keyboard import keyboard_gen\nfrom .api.exceptions import *\n-from .api.fetch_method import FetchMethod\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/__init__.py",
"new_path": "vkbottle/api/__init__.py",
"diff": "-from .api import Api, UserApi\n+from .api import Api, UserApi, request\nfrom .exceptions import *\nfrom .template import template_gen, TemplateElement\n"
},
{
"change_type": "DELETE",
"old_path": "vkbottle/api/fetch_method.py",
"new_path": null,
"diff": "-from typing import Callable\n-from asyncio import iscoroutinefunction\n-\n-from ..api import Api\n-from ..framework import Bot\n-from .exceptions import FetchMethodError\n-\n-\n-async def assign_function(*args, **kwargs):\n- raise FetchMethodError(\"Please assign FM Function\")\n-\n-\n-def assigned(iterator):\n- return len(iterator) > 0\n-\n-\n-class FetchMethod:\n- def __init__(self, bot: Bot):\n- self.api: Api = bot.api\n-\n- def __call__(self, desc: str = None):\n- return Fetching(self.api)\n-\n-\n-class Fetching:\n- def __init__(self, api):\n- self.api: Bot.api = api\n- self.running_func: Callable = assign_function\n- self.args: list = []\n- self.kwargs: dict = {}\n-\n- def __call__(self, function: Callable = None, *args, IGNORE_CORO=True, **kwargs):\n- if not iscoroutinefunction(function) and not IGNORE_CORO:\n- raise FetchMethodError(\"Function is not awaitable (make it async)\")\n- self.running_func = function or self.running_func\n- if assigned(args):\n- self.args = args\n- if assigned(kwargs):\n- self.kwargs = kwargs\n-\n- return self\n-\n- async def run(self):\n- response = await self.running_func(*self.args, **self.kwargs)\n- return response\n-\n- async def run_without_response(self):\n- await self.running_func(*self.args, **self.kwargs)\n- return self\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -4,7 +4,7 @@ from asyncio import TimeoutError as AsyncioTimeoutError\nfrom aiohttp.client_exceptions import ClientConnectionError, ServerTimeoutError\nfrom ..const import DEFAULT_BOT_FOLDER, VBML_INSTALL\n-from ..api import Api\n+from ..api import Api, request\nfrom ..handler import Handler, ErrorHandler\nfrom ..utils.logger import Logger, keyboard_interrupt\nfrom ..http import HTTP\n@@ -25,7 +25,7 @@ except ImportError:\nDEFAULT_WAIT = 20\n-class Vals(PatchedValidators):\n+class DefaultValidators(PatchedValidators):\npass\n@@ -35,53 +35,93 @@ class Bot(HTTP, EventProcessor):\ndef __init__(\nself,\ntoken: str,\n- group_id: int,\n+ *,\n+ group_id: int = None,\ndebug: bool = True,\nplugin_folder: str = None,\nlog_to_file: bool = False,\nlog_to: str = None,\n- vbml_patcher: Patcher = None,\nsecret: str = None,\n):\n+ \"\"\"\n+ Init bot\n+ :param token: bot token\n+ :param group_id: [auto]\n+ :param debug: should bot debug messages for emulating\n+ :param plugin_folder: folder for logs\n+ :param log_to_file: make logs\n+ :param log_to: log path\n+ :param secret: secret vk code for callback\n+ \"\"\"\n+ # Base bot classifiers\nself.__token: str = token\n- self.__group_id: int = group_id\nself.__loop: AbstractEventLoop = get_event_loop()\nself.__debug: bool = debug\nself.__wait = None\n- self.__logger_opt = (plugin_folder, log_to_file, log_to)\n- self.__vbml_patcher = vbml_patcher\nself.__secret = secret\nself._status: BotStatus = BotStatus()\n+ # Sign assets\nself.__api: Api = Api(token)\nApi.set_current(self.__api)\n- self._patcher: Patcher = vbml_patcher or Patcher(pattern=\"^{}$\")\n+\n+ if not Patcher.get_current():\n+ Patcher.set_current(Patcher(pattern=\"^{}$\", validators=DefaultValidators))\nself._logger: Logger = Logger(\n- debug,\n+ debug=debug,\nlog_file=log_to,\nplugin_folder=folder_checkup(plugin_folder or \"vkbottle_bot\"),\nlogger_enabled=log_to_file,\n)\n+ self.group_id = group_id or self.get_id_by_token(token)\n+ # Main workers\nself.branch: BranchManager = BranchManager(plugin_folder or DEFAULT_BOT_FOLDER)\nself.on: Handler = Handler(self._logger, group_id)\nself.error_handler: ErrorHandler = ErrorHandler()\ndef dispatch(self, ext: \"Bot\"):\n+ \"\"\"\n+ Concatenate handlers to current bot object\n+ :param ext:\n+ :return:\n+ \"\"\"\nself.on.concatenate(ext.on)\nself.error_handler.update(ext.error_handler.processors)\n- @property\n- def group_id(self):\n- return self.__group_id\n+ @staticmethod\n+ def get_id_by_token(token: str):\n+ \"\"\"\n+ Get group id from token\n+ :param token:\n+ :return:\n+ \"\"\"\n+ response = get_event_loop().run_until_complete(\n+ request(token, \"groups.getById\")\n+ )\n+ if \"error\" in response:\n+ raise VKError(\"Token is invalid\")\n+ return response[\"response\"][0][\"id\"]\ndef _check_secret(self, secret: str):\n+ \"\"\"\n+ Match secret code with current secret\n+ :param secret:\n+ :return:\n+ \"\"\"\nif self.__secret:\nreturn secret == self.__secret\nreturn None\ndef set_debug(self, debug: bool, **params):\n+ \"\"\"\n+ DEPRECATED\n+ Set debug regime\n+ :param debug: debug mode\n+ :param params: logging params\n+ :return:\n+ \"\"\"\nself.__debug = debug\nself._logger: Logger = Logger(\ndebug,\n@@ -94,20 +134,31 @@ class Bot(HTTP, EventProcessor):\n)\ndef loop_update(self, loop: AbstractEventLoop = None):\n+ \"\"\"\n+ Update event loop\n+ :param loop:\n+ :return:\n+ \"\"\"\nself.__loop = loop or get_event_loop()\nreturn self.__loop\ndef empty_copy(self) -> \"Bot\":\n+ \"\"\"\n+ Create an empty copy of Bot\n+ :return: Bot\n+ \"\"\"\ncopy = Bot(\nself.__token,\n- self.__group_id,\n- self.__debug,\n- *self.__logger_opt,\n- self.__vbml_patcher\n+ group_id=self.group_id,\n+ debug=self.__debug,\n)\nreturn copy\ndef copy(self) -> \"Bot\":\n+ \"\"\"\n+ Create copy of Bot\n+ :return: Bot\n+ \"\"\"\nbot = self.empty_copy()\nbot.loop_update()\nbot.on = self.on\n@@ -129,7 +180,7 @@ class Bot(HTTP, EventProcessor):\n@property\ndef patcher(self):\n- return self._patcher\n+ return Patcher.get_current()\nasync def get_server(self) -> dict:\n\"\"\"\n@@ -160,6 +211,9 @@ class Bot(HTTP, EventProcessor):\nreturn await self.make_long_request(longPollServer)\ndef run_polling(self):\n+ \"\"\"\n+ :return:\n+ \"\"\"\nloop = self.__loop\ntry:\nloop.run_until_complete(self.run())\n@@ -171,7 +225,7 @@ class Bot(HTTP, EventProcessor):\nself._logger.info(\"Polling will be started. Is it OK?\")\nawait self.get_server()\n- self._logger.debug(\"Polling successfully started\")\n+ self._logger.debug(\"Polling successfully started. Press Ctrl+C to stop it\")\nwhile True:\ntry:\n@@ -216,20 +270,8 @@ class Bot(HTTP, EventProcessor):\nif not client_info:\nraise VKError(\"Change API version to 5.103 or later\") from None\nobj = obj[\"message\"]\n- processor = dict(obj=obj, client_info=client_info)\n-\n- if obj[\"peer_id\"] < 2e9:\n- if obj[\"from_id\"] not in self.branch.queue:\n- task = await self._private_message_processor(**processor)\n- else:\n- task = await self._branched_processor(**processor)\n- else:\n- if obj[\"peer_id\"] not in self.branch.queue:\n- task = await self._chat_message_processor(**processor)\n- else:\n- task = await self._branched_processor(**processor)\n- await self._handler_return(task, **processor)\n+ await self._processor(obj, client_info)\nelse:\n# If this is an event of the group AND this is not SELF-EVENT\n@@ -238,6 +280,7 @@ class Bot(HTTP, EventProcessor):\n)\nexcept VKError as e:\n+\ne = list(e.args)[0]\nif e[0] in self.error_handler.processors:\nhandler = self.error_handler.processors[e[0]][\"call\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -32,13 +32,16 @@ class EventProcessor(RegexHelper):\n_logger: Logger\n__loop: AbstractEventLoop\n- async def _private_message_processor(self, obj: dict, client_info: dict):\n- \"\"\"\n- Private message processor. Using regex to process regular expressions in messages\n- :param obj: VK API Event Object\n- \"\"\"\n+ async def _processor(self, obj: dict, client_info: dict):\n+ processor = dict(obj=obj, client_info=client_info)\n- message = Message(**obj, client_info=client_info)\n+ message = Message(\n+ **{**obj, \"text\": self.init_bot_mention(obj[\"text\"])},\n+ client_info=client_info\n+ )\n+\n+ if message.from_id in self.branch.queue or message.peer_id in self.branch.queue:\n+ return self._branched_processor(obj, client_info)\nif self.on.pre:\nawait (self.on.pre(message))\n@@ -49,65 +52,18 @@ class EventProcessor(RegexHelper):\n)\n)\n- for rules in [*self.on.message.payload.rules, *self.on.message.rules]:\n+ task = None\n+ for rules in self.on.rules:\nif all([await rule.check(message) for rule in rules]):\n- args = [a for rule in rules for a in rule.context.args]\n- kwargs = {\n- k: v for rule in rules for k, v in rule.context.kwargs.items()\n- }\n- if not rules[0].data.get(\"ignore_ans\"):\n- args = [message, *args]\n- task = await rules[0].call(*args, **kwargs)\n-\n- self._logger.debug(\n- \"New message compiled with decorator <\\x1b[35m{}\\x1b[0m> (from: {})\".format(\n- rules[0].call.__name__, message.from_id\n- )\n- )\n-\n- return task\n-\n- if self.on.undefined_func:\n- task = await (self.on.undefined_func(message))\n- self._logger.debug(\n- \"New message compiled with decorator\"\n- \" <\\x1b[35mon-message-undefined\\x1b[0m> (from: {})\".format(\n- message.from_id\n- )\n- )\n- return task\n- self._logger.info(\"Add on-undefined message handler to persue group online!\")\n-\n- async def _chat_message_processor(self, obj: dict, client_info: dict):\n- \"\"\"\n- Chat messages processor. Using regex to process regular expressions in messages\n- :param obj: VK API Event Object\n- \"\"\"\n-\n- message = Message(\n- **{**obj, \"text\": self.init_bot_mention(obj[\"text\"])},\n- client_info=client_info\n- )\n-\n- if self.on.pre:\n- await (self.on.pre(message))\n-\n- for rules in [*self.on.chat_message.payload.rules, *self.on.chat_message.rules]:\n- if all([await rule.check(message) for rule in rules]):\nargs = [a for rule in rules for a in rule.context.args]\nkwargs = {\n- k: v for rule in rules for k, v in rule.context.kwargs.items()\n+ k: v for rule in rules for k, v in\n+ rule.context.kwargs.items()\n}\n- if not rules[0].data.get(\"ignore_ans\"):\n+ if not getattr(rules[0], \"data\", {}).get(\"ignore_ans\"):\nargs = [message, *args]\n- self._logger.debug(\n- '-> MESSAGE FROM CHAT {} TEXT \"{}\" TIME %#%'.format(\n- message.peer_id, message.text.replace(\"\\n\", \" \")\n- )\n- )\n-\ntask = await rules[0].call(*args, **kwargs)\nself._logger.debug(\n@@ -115,8 +71,9 @@ class EventProcessor(RegexHelper):\nrules[0].call.__name__, message.from_id\n)\n)\n+ break\n- return task\n+ await self._handler_return(task, **processor)\nasync def _event_processor(self, obj: dict, event_type: str):\n\"\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "import typing\nimport json\n+from copy import copy\nfrom vbml import Pattern, Patcher\nfrom ...types import Message, BaseModel\nfrom ...types import user_longpoll\n+class Copy:\n+ def copy(self):\n+ return copy(self)\n+\n+\nclass RuleExecute:\ndef __init__(self):\nself.args = []\n@@ -16,7 +22,7 @@ class RuleExecute:\nreturn self.args, self.kwargs\n-class AbstractRule:\n+class AbstractRule(Copy):\ndef __init_subclass__(cls, **kwargs):\ncls.call: typing.Optional[typing.Callable] = None\ncls.context: RuleExecute = RuleExecute()\n@@ -26,12 +32,16 @@ class AbstractRule:\nself.context = RuleExecute()\nif data is not None:\nsetattr(self, \"data\", {**getattr(self, \"data\", {}), **data})\n- ...\nasync def check(self, event):\n...\n+class Any(AbstractRule):\n+ async def check(self, event):\n+ return True\n+\n+\nclass AbstractUserRule(AbstractRule):\nasync def check(self, update: typing.Tuple[dict, BaseModel]):\n...\n@@ -104,6 +114,18 @@ class UserMessageRule(AbstractUserRule, UnionMixin):\nreturn True\n+class ChatMessage(AbstractMessageRule):\n+ async def check(self, message: Message):\n+ if message.peer_id > 2e9:\n+ return True\n+\n+\n+class PrivateMessage(AbstractMessageRule):\n+ async def check(self, message: Message):\n+ if message.peer_id < 2e9:\n+ return True\n+\n+\nclass VBML:\ndef __init__(\nself,\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -8,7 +8,15 @@ from .events import Event\nfrom ..utils import Logger\nfrom ..const import __version__\nfrom ..api import HandlerError\n-from ..framework.rule import AbstractRule, VBMLRule, ChatActionRule, PayloadRule\n+from ..framework.rule import (\n+ AbstractRule,\n+ VBMLRule,\n+ ChatActionRule,\n+ PayloadRule,\n+ ChatMessage,\n+ PrivateMessage,\n+ Any,\n+)\ndef should_ignore_ans(func: typing.Callable, arguments: list) -> bool:\n@@ -21,14 +29,14 @@ class Handler:\ndef __init__(self, logger: Logger, group_id: int = 0):\nself.__group_id: int = group_id\nself.__logger = logger\n+ self.rules: typing.List[typing.List[AbstractRule]] = list()\n- self.message: MessageHandler = MessageHandler()\n- self.chat_message: MessageHandler = MessageHandler()\n- self.message_both: MessageHandler = MessageHandler()\n+ self.message: MessageHandler = MessageHandler(default_rules=[PrivateMessage()])\n+ self.chat_message: MessageHandler = MessageHandler(default_rules=[ChatMessage()])\n+ self.message_handler: MessageHandler = MessageHandler(default_rules=[Any()])\nself.event: Event = Event()\nself._pre_p: typing.Optional[typing.Callable] = None\n- self.__undefined_message_func = None\nself._patcher = Patcher.get_current()\nif not hasattr(Pattern, \"context_copy\"):\n@@ -46,7 +54,7 @@ class Handler:\n\"\"\"\nself.message.concatenate(handler.message)\nself.chat_message.concatenate(handler.chat_message)\n- self.message_both.concatenate(handler.message_both)\n+ self.message_handler.concatenate(handler.message_handler)\nself.event.rules += handler.event.rules\nif self.pre is None:\n@@ -59,11 +67,12 @@ class Handler:\n:return:\n\"\"\"\n- self.message.rules += self.message_both.rules\n- self.chat_message.rules += self.message_both.rules\n+ self.message_handler.rules += self.message.rules + self.chat_message.rules\n+ self.message_handler.payload.rules += self.message.payload.rules + self.chat_message.payload.rules\n- self.message.payload.rules += self.message_both.payload.rules\n- self.chat_message.payload.rules += self.message_both.payload.rules\n+ self.rules = (\n+ self.message_handler.rules + self.message_handler.payload.rules\n+ )\nif get_current_rest:\n@@ -80,7 +89,7 @@ class Handler:\ndef change_prefix_for_all(self, prefix: list) -> None:\nself.message.prefix = prefix\nself.chat_message.prefix = prefix\n- self.message_both.prefix = prefix\n+ self.message_handler.prefix = prefix\ndef chat_action(\nself, type_: typing.Union[str, typing.List[str]], rules: dict = None\n@@ -99,17 +108,6 @@ class Handler:\nreturn decorator\n- def message_undefined(self):\n- \"\"\"\n- If private message is not in message processor this single function will be caused\n- \"\"\"\n-\n- def decorator(func):\n- self.__undefined_message_func = func\n- return func\n-\n- return decorator\n-\ndef chat_mention(self):\ndef decorator(func):\npattern = self._patcher.pattern(\n@@ -133,10 +131,6 @@ class Handler:\nreturn decorator\n- @property\n- def undefined_func(self):\n- return self.__undefined_message_func\n-\n@property\ndef pre(self):\nreturn self._pre_p\n@@ -159,12 +153,44 @@ class Handler:\nclass MessageHandler:\n- def __init__(self):\n+ def __init__(self, default_rules: typing.List = None):\nself.payload: PayloadHandler = PayloadHandler()\nself.rules: typing.List[typing.List[AbstractRule]] = list()\n+ self._default_rules = default_rules or []\nself.prefix: list = [\"/\", \"!\"]\nself._patcher = Patcher.get_current()\n+ def add_rules(self, rules: typing.List[AbstractRule], func: typing.Callable):\n+ current = list()\n+ for rule in rules + self.default_rules:\n+ rule.create(func)\n+ current.append(rule)\n+\n+ self.rules.append(current)\n+\n+ def _text_rule(\n+ self,\n+ func: typing.Callable,\n+ text: typing.Union[str, Pattern],\n+ lower: bool,\n+ command: bool,\n+ pattern: str,\n+ ):\n+ if not isinstance(text, Pattern):\n+ prefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\n+ pattern = self._patcher.pattern(\n+ text,\n+ pattern=(prefix + pattern) if prefix else pattern,\n+ flags=re.IGNORECASE if lower else None,\n+ )\n+ rule = VBMLRule(pattern)\n+ rule.data[\"ignore_ans\"] = should_ignore_ans(func, pattern.arguments)\n+ else:\n+ rule = VBMLRule(self._patcher.pattern(text))\n+ rule.data[\"ignore_ans\"] = should_ignore_ans(func, text.arguments)\n+\n+ return rule\n+\ndef concatenate(self, message_handler: \"MessageHandler\"):\nself.rules += message_handler.rules\nself.prefix += [p for p in message_handler.prefix if p not in self.prefix]\n@@ -188,31 +214,12 @@ class MessageHandler:\n:param pattern: any regex pattern pattern. {} means text which will be formatted\n:return: True\n\"\"\"\n- current: typing.List[AbstractRule] = list()\n+ current: typing.List[AbstractRule] = list(rules)\nif text:\n- if not isinstance(text, Pattern):\n- prefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\n- pattern = self._patcher.pattern(\n- text,\n- pattern=(prefix + \"{}$\") if prefix else pattern,\n- flags=re.IGNORECASE if lower else None,\n- )\n- rule = VBMLRule(pattern)\n- rule.create(func)\n- rule.data[\"ignore_ans\"] = should_ignore_ans(func, pattern.arguments)\n- current.append(rule)\n- else:\n- rule = VBMLRule(self._patcher.pattern(text))\n- rule.create(func)\n- rule.data[\"ignore_ans\"] = should_ignore_ans(func, text.arguments)\n- current.append(rule)\n+ current.append(self._text_rule(func, text, lower, command, pattern or \"{}$\"))\n- for rule in rules:\n- rule.create(func)\n- current.append(rule)\n-\n- self.rules.append(current)\n+ self.add_rules(current, func)\ndef rule(self, *rules):\ndef decorator(func):\n@@ -222,7 +229,7 @@ class MessageHandler:\nrule.create(func)\ncurrent.append(rule)\n- self.rules.append(current)\n+ self.add_rules(current, func)\nreturn func\nreturn decorator\n@@ -242,31 +249,12 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n- current: typing.List[AbstractRule] = list()\n+ current: typing.List[AbstractRule] = list(rules)\nif text:\n- if not isinstance(text, Pattern):\n- prefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\n- pattern = self._patcher.pattern(\n- text,\n- pattern=(prefix + \"{}$\") if prefix else \"{}$\",\n- flags=re.IGNORECASE if lower else None,\n- )\n- rule = VBMLRule(pattern)\n- rule.create(func)\n- rule.data[\"ignore_ans\"] = should_ignore_ans(func, pattern.arguments)\n- current.append(rule)\n- else:\n- rule = VBMLRule(self._patcher.pattern(text))\n- rule.create(func)\n- rule.data[\"ignore_ans\"] = should_ignore_ans(func, text.arguments)\n- current.append(rule)\n+ current.append(self._text_rule(func, text, lower, command, \"{}$\"))\n- for rule in rules:\n- rule.create(func)\n- current.append(rule)\n-\n- self.rules.append(current)\n+ self.add_rules(current, func)\nreturn func\nreturn decorator\n@@ -290,32 +278,13 @@ class MessageHandler:\n\"\"\"\ndef decorator(func):\n- current: typing.List[AbstractRule] = list()\n+ current: typing.List[AbstractRule] = list(rules)\nif text:\n- if not isinstance(text, Pattern):\n- prefix = (\"[\" + \"|\".join(\n- self.prefix) + \"]\") if command else \"\"\n- pattern = self._patcher.pattern(\n- text,\n- pattern=(prefix + \"{}\") if prefix else \"{}\",\n- flags=re.IGNORECASE if lower else None,\n- )\n- rule = VBMLRule(pattern)\n- rule.create(func)\n- rule.data[\"ignore_ans\"] = should_ignore_ans(func, pattern.arguments)\n- current.append(rule)\n- else:\n- rule = VBMLRule(self._patcher.pattern(text))\n- rule.create(func)\n- rule.data[\"ignore_ans\"] = should_ignore_ans(func, text.arguments)\n- current.append(rule)\n-\n- for rule in rules:\n- rule.create(func)\n- current.append(rule)\n+ current.append(\n+ self._text_rule(func, text, lower, command, \"{}\"))\n- self.rules.append(current)\n+ self.add_rules(current, func)\nreturn func\nreturn decorator\n@@ -345,7 +314,12 @@ class MessageHandler:\ndef __repr__(self):\nfor rules in self.rules:\n- print(rules[0].call.__name__ + \":\", \", \".join([rule.__class__.__name__ for rule in rules]))\n+ print(rules[0].call.__name__ + \": \" + \", \".join([rule.__class__.__name__ for rule in rules]))\n+ return str()\n+\n+ @property\n+ def default_rules(self):\n+ return [r.copy() for r in self._default_rules]\nclass PayloadHandler:\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Change Rules again |
718,838 | 01.02.2020 23:28:06 | -10,800 | eff9d166a202fcf865da0e020e32e329a08405f2 | v1 Update docs and examples | [
{
"change_type": "DELETE",
"old_path": "docs/TODO.md",
"new_path": null,
"diff": "-# TODO\n-\n-There is a list of checkboxes of implementing functions in VKBottle\n-\n-### :tada:0.15:\n-\n-- [x] **Callback Support**\n-\n-- [x] Events Queue executor\n-\n-- [x] Patcher for message variables types `(by timoniq)`\n-\n-- [x] Message variable types parser\n-\n-- [ ] **Execute Wrapper** `(idea by 1)`\n-\n-- [x] .lower regex for messages :sweat:\n-\n-### :mortar_board:Pull your suggests here:\n-\n-- [x] HTTP Request maker for callback & longpoll `(idea by 1)`\n-\n-### :heart:Thanks for Idea to\n-\n-@vasilkovivan`\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/bot_decorators.py",
"new_path": "examples/bot_decorators.py",
"diff": "@@ -22,7 +22,7 @@ async def wrapper(ans: Message):\nawait ans(\"clean me..\")\n-@bot.on.message_both(text=\"apple\")\n+@bot.on.message_handler(text=\"apple\")\nasync def wrapper(ans: Message):\n# Works if message 'apple' in both (chat or private) dialog received\nawait ans(\"steve jobs..((((\")\n@@ -34,7 +34,7 @@ async def wrapper(ans: Message):\nawait ans(\"this message starts with /start, yes?\")\n-@bot.on.message_both.regex(\".*?sad.*?\")\n+@bot.on.message_handler.regex(\".*?sad.*?\")\nasync def wrapper(ans: Message):\n# Works if regex match r'.*?sad.*?' is True\nawait ans(\"sadness, im sad, sadistic. its all on my own!\")\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Update docs and examples |
718,838 | 02.02.2020 14:18:39 | -10,800 | 4e018baa0db92932fcf35f8ca95a953639612994 | v1 User LP error handling
+ reformatted by black | [
{
"change_type": "MODIFY",
"old_path": "examples/callback_bot.py",
"new_path": "examples/callback_bot.py",
"diff": "@@ -4,17 +4,20 @@ from aiohttp.web import RouteTableDef, Application, Request, run_app\napp = Application()\nroutes = RouteTableDef()\n-bot = Bot('my-token', 123, debug=True, secret=\"SecretKey\")\n+bot = Bot(\"my-token\", 123, debug=True, secret=\"SecretKey\")\n-@routes.get('/bot')\n+@routes.get(\"/bot\")\nasync def executor(request: Request):\n- return await bot.emulate(event=dict(request.query), confirmation_token=\"ConfirmationToken\")\n+ return await bot.emulate(\n+ event=dict(request.query), confirmation_token=\"ConfirmationToken\"\n+ )\n-@bot.on.message(text='test', lower=True)\n+@bot.on.message(text=\"test\", lower=True)\nasync def wrapper():\nreturn \"test\"\n+\napp.add_routes(routes)\nrun_app(app)\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/user_longpoll.py",
"new_path": "examples/user_longpoll.py",
"diff": "@@ -13,9 +13,14 @@ async def wrapper(ans: Message, name):\n@user.on.message_read_out()\nasync def call(event: dict):\n- await user.api.request(\"messages.send\",\n- {\"message\": \"Ye! You finally read it!\",\n+ await user.api.request(\n+ \"messages.send\",\n+ {\n+ \"message\": \"Ye! You finally read it!\",\n\"peer_id\": event[\"peer_id\"],\n- \"random_id\": 0})\n+ \"random_id\": 0,\n+ },\n+ )\n+\nuser.run_polling()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/api.py",
"new_path": "vkbottle/api/api.py",
"diff": "@@ -15,16 +15,10 @@ def exception_handler(loop, context):\nasync def request(\n- token: str,\n- method: str,\n- params: dict = None,\n- session: HTTPRequest = None\n+ token: str, method: str, params: dict = None, session: HTTPRequest = None\n):\nurl = \"{}{method}/?access_token={token}&v={version}\".format(\n- API_URL,\n- method=method,\n- token=token,\n- version=API_VERSION,\n+ API_URL, method=method, token=token, version=API_VERSION,\n)\nsession = session or HTTPRequest()\n@@ -37,7 +31,8 @@ async def request_instance(method: str, req: typing.Coroutine):\nif not isinstance(response, dict):\nwhile not isinstance(response, dict):\ndelay = 1\n- cprint(f\"\\n--- {time.strftime('%m-%d %H:%M:%S')}\"\n+ cprint(\n+ f\"\\n--- {time.strftime('%m-%d %H:%M:%S')}\"\nf\"{time.localtime()} - DELAY {delay * 5} sec\\n\"\nf\"Check your internet connection. Maybe VK died, request returned: {response}\"\nf\"Error appeared after request: {method}\",\n@@ -47,16 +42,16 @@ async def request_instance(method: str, req: typing.Coroutine):\ndelay += 1\nresponse = await req\n- cprint(f\"--- {time.strftime('%m-%d %H:%M:%S', time.localtime())}\\n\"\n+ f\"RESPONSE: {response}\\n\",\n+ cprint(\n+ f\"--- {time.strftime('%m-%d %H:%M:%S', time.localtime())}\\n\"\nf\"- METHOD SUCCESS after {5 * sum(range(1, delay))} sec\\n\"\nf\"RESPONSE: {response}\\n\",\n- color=\"green\"\n+ color=\"green\",\n)\nif \"error\" in response:\n- raise VKError(\n- [response[\"error\"][\"error_code\"], response[\"error\"][\"error_msg\"]]\n- )\n+ raise VKError([response[\"error\"][\"error_code\"], response[\"error\"][\"error_msg\"]])\nreturn response[\"response\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/keyboard/action.py",
"new_path": "vkbottle/api/keyboard/action.py",
"diff": "@@ -14,8 +14,9 @@ class Action:\n):\nfor k, v in except_none_self(locals()).items():\nif not hasattr(cls, k):\n- raise KeyboardError(\"Action {} cannot assign {}\".format(\n- cls.__class__.__name__, k))\n+ raise KeyboardError(\n+ \"Action {} cannot assign {}\".format(cls.__class__.__name__, k)\n+ )\nsetattr(cls, k, v)\ncls.type = getattr(cls, \"type\")\n@@ -54,4 +55,3 @@ class VKApps(Action):\npayload: str = None\nlabel: str = None\nhash: str = None\n-\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/keyboard/keyboard.py",
"new_path": "vkbottle/api/keyboard/keyboard.py",
"diff": "@@ -5,12 +5,8 @@ import typing, json\nclass KeyboardButton:\n- def __init__(\n- self,\n- action: typing.Union[Text],\n- color: str = None\n- ):\n- self.action = (action or Text)\n+ def __init__(self, action: typing.Union[Text], color: str = None):\n+ self.action = action or Text\nself.color = color or \"default\"\ndef create(\n@@ -30,10 +26,7 @@ class KeyboardButton:\n@property\ndef button(self):\n- return {\n- \"action\": except_none_self(self.action.dict()),\n- \"color\": self.color\n- }\n+ return {\"action\": except_none_self(self.action.dict()), \"color\": self.color}\nclass Keyboard:\n@@ -56,9 +49,6 @@ class Keyboard:\ndef generate(self):\nkeyboard = {\n\"one_time\": self.one_time,\n- \"buttons\": [\n- [b.button for b in row]\n- for row in self.buttons\n- ]\n+ \"buttons\": [[b.button for b in row] for row in self.buttons],\n}\nreturn json.dumps(keyboard)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -97,9 +97,7 @@ class Bot(HTTP, EventProcessor):\n:param token:\n:return:\n\"\"\"\n- response = get_event_loop().run_until_complete(\n- request(token, \"groups.getById\")\n- )\n+ response = get_event_loop().run_until_complete(request(token, \"groups.getById\"))\nif \"error\" in response:\nraise VKError(\"Token is invalid\")\nreturn response[\"response\"][0][\"id\"]\n@@ -130,7 +128,7 @@ class Bot(HTTP, EventProcessor):\nk: v\nfor k, v in self._logger.logger_params.items()\nif k not in {**params, \"debug\": None}\n- }\n+ },\n)\ndef loop_update(self, loop: AbstractEventLoop = None):\n@@ -147,11 +145,7 @@ class Bot(HTTP, EventProcessor):\nCreate an empty copy of Bot\n:return: Bot\n\"\"\"\n- copy = Bot(\n- self.__token,\n- group_id=self.group_id,\n- debug=self.__debug,\n- )\n+ copy = Bot(self.__token, group_id=self.group_id, debug=self.__debug,)\nreturn copy\ndef copy(self) -> \"Bot\":\n@@ -192,23 +186,23 @@ class Bot(HTTP, EventProcessor):\n)\nreturn self.longPollServer\n- async def make_long_request(self, longPollServer: dict) -> dict:\n+ async def make_long_request(self, long_poll_server: dict) -> dict:\n\"\"\"\nMake longPoll request to the VK Server\n- :param longPollServer:\n+ :param long_poll_server:\n:return: VK LongPoll Event\n\"\"\"\ntry:\nurl = \"{}?act=a_check&key={}&ts={}&wait={}&rps_delay=0\".format(\n- longPollServer[\"server\"],\n- longPollServer[\"key\"],\n- longPollServer[\"ts\"],\n+ long_poll_server[\"server\"],\n+ long_poll_server[\"key\"],\n+ long_poll_server[\"ts\"],\nself.__wait or DEFAULT_WAIT,\n)\nreturn await self.request.post(url)\nexcept AsyncioTimeoutError:\nself._logger.error(\"TimeoutError of asyncio in longpoll request\")\n- return await self.make_long_request(longPollServer)\n+ return await self.make_long_request(long_poll_server)\ndef run_polling(self):\n\"\"\"\n@@ -275,9 +269,9 @@ class Bot(HTTP, EventProcessor):\nelse:\n# If this is an event of the group AND this is not SELF-EVENT\n- task = await (\n+ await (\nself._event_processor(obj=obj, event_type=update[\"type\"])\n- )\n+ ) # noqa\nexcept VKError as e:\n@@ -298,7 +292,7 @@ class Bot(HTTP, EventProcessor):\n)\nraise VKError(e)\n- except Exception:\n+ except:\nself._logger.error(\n\"While bot worked error occurred TIME %#%\\n\\n{}\".format(\ntraceback.format_exc()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/processor.py",
"new_path": "vkbottle/framework/processor.py",
"diff": "@@ -58,8 +58,7 @@ class EventProcessor(RegexHelper):\nargs = [a for rule in rules for a in rule.context.args]\nkwargs = {\n- k: v for rule in rules for k, v in\n- rule.context.kwargs.items()\n+ k: v for rule in rules for k, v in rule.context.kwargs.items()\n}\nif not getattr(rules[0], \"data\", {}).get(\"ignore_ans\"):\nargs = [message, *args]\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "-import typing\n+import typing, traceback\nfrom asyncio import get_event_loop, AbstractEventLoop\nimport aiohttp, vbml\n@@ -44,7 +44,7 @@ class User(HTTP):\ndebug,\nplugin_folder=folder_checkup(plugin_folder or \"vkbottle_user_lp\"),\nlogger_enabled=log_to_file,\n- prefix=\"User LP VKBottle\"\n+ prefix=\"User LP VKBottle\",\n)\n@property\n@@ -92,11 +92,16 @@ class User(HTTP):\nself.__loop.create_task(self.emulate(event))\nawait self.get_server()\n- except (aiohttp.ClientConnectionError, aiohttp.ServerTimeoutError, TimeoutError):\n+ except (\n+ aiohttp.ClientConnectionError,\n+ aiohttp.ServerTimeoutError,\n+ TimeoutError,\n+ ):\n# No internet connection\nawait self._logger.warning(\"Server Timeout Error!\")\nasync def emulate(self, event: dict):\n+ try:\nfor update in event.get(\"updates\", []):\nupdate_fields = update[1:]\nfor rule in self.on.rules:\n@@ -109,16 +114,22 @@ class User(HTTP):\ndata = rule.data.get(\"dataclass\")(**data)\nif isinstance(check, tuple):\nif all([await s_rule.check(data) for s_rule in check]):\n- args = (\n- [a for rule in check for a in rule.context.args]\n- )\n- kwargs = (\n- {k: v for rule in check for k, v in rule.context.kwargs.items()}\n- )\n+ args = [a for rule in check for a in rule.context.args]\n+ kwargs = {\n+ k: v\n+ for rule in check\n+ for k, v in rule.context.kwargs.items()\n+ }\nelse:\ncontinue\nawait rule.call(data, *args, **kwargs)\n+ except:\n+ self._logger.error(\n+ \"While user lp worked error occurred TIME %#%\\n\\n{}\".format(\n+ traceback.format_exc()\n+ )\n+ )\ndef run_polling(self):\nloop = self.__loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -32,7 +32,9 @@ class Handler:\nself.rules: typing.List[typing.List[AbstractRule]] = list()\nself.message: MessageHandler = MessageHandler(default_rules=[PrivateMessage()])\n- self.chat_message: MessageHandler = MessageHandler(default_rules=[ChatMessage()])\n+ self.chat_message: MessageHandler = MessageHandler(\n+ default_rules=[ChatMessage()]\n+ )\nself.message_handler: MessageHandler = MessageHandler(default_rules=[Any()])\nself.event: Event = Event()\n@@ -68,12 +70,12 @@ class Handler:\n\"\"\"\nself.message_handler.rules += self.message.rules + self.chat_message.rules\n- self.message_handler.payload.rules += self.message.payload.rules + self.chat_message.payload.rules\n-\n- self.rules = (\n- self.message_handler.rules + self.message_handler.payload.rules\n+ self.message_handler.payload.rules += (\n+ self.message.payload.rules + self.chat_message.payload.rules\n)\n+ self.rules = self.message_handler.rules + self.message_handler.payload.rules\n+\nif get_current_rest:\n# Check updates from timoniq/vkbottle-rest\n@@ -222,7 +224,9 @@ class MessageHandler:\ncurrent: typing.List[AbstractRule] = list(rules)\nif text:\n- current.append(self._text_rule(func, text, lower, command, pattern or \"{}$\"))\n+ current.append(\n+ self._text_rule(func, text, lower, command, pattern or \"{}$\")\n+ )\nself.add_rules(current, func)\n@@ -286,8 +290,7 @@ class MessageHandler:\ncurrent: typing.List[AbstractRule] = list(rules)\nif text:\n- current.append(\n- self._text_rule(func, text, lower, command, \"{}\"))\n+ current.append(self._text_rule(func, text, lower, command, \"{}\"))\nself.add_rules(current, func)\nreturn func\n@@ -319,7 +322,11 @@ class MessageHandler:\ndef __repr__(self):\nfor rules in self.rules:\n- print(rules[0].call.__name__ + \": \" + \", \".join([rule.__class__.__name__ for rule in rules]))\n+ print(\n+ rules[0].call.__name__\n+ + \": \"\n+ + \", \".join([rule.__class__.__name__ for rule in rules])\n+ )\nreturn str()\n@property\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/user.py",
"new_path": "vkbottle/handler/user.py",
"diff": "@@ -7,7 +7,7 @@ MESSAGE_FIELDS = {\n8: (\"peer_id\", \"timestamp\", \"text\"),\n32: (\"peer_id\", \"timestamp\", \"text\"),\n64: (\"peer_id\", \"timestamp\", \"text\"),\n- 128: (\"peer_id\", \"timestamp\", \"text\", \"random_id\")\n+ 128: (\"peer_id\", \"timestamp\", \"text\", \"random_id\"),\n}\n@@ -28,65 +28,70 @@ class Handler:\ndef message_flag_change(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(1, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"message_flag_change\",\n- \"data\": [\n- \"message_id\",\n- \"flags\",\n- *self.additional_fields(1)\n- ]})\n+ \"data\": [\"message_id\", \"flags\", *self.additional_fields(1)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef message_flag_set(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(2, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"message_flag_set\",\n- \"data\": [\n- \"message_id\",\n- \"mask\",\n- *self.additional_fields(2)\n- ]})\n+ \"data\": [\"message_id\", \"mask\", *self.additional_fields(2)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef message_flag_remove(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(3, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"message_flag_remove\",\n- \"data\": [\n- \"message_id\",\n- \"mask\",\n- *self.additional_fields(3)\n- ]})\n+ \"data\": [\"message_id\", \"mask\", *self.additional_fields(3)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef message_new(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(4, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"message_new\",\n- \"data\": [\n- \"message_id\",\n- \"flags\",\n- *self.additional_fields(4)\n- ],\n- \"dataclass\": Message\n- })\n+ \"data\": [\"message_id\", \"flags\", *self.additional_fields(4)],\n+ \"dataclass\": Message,\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef message_edit(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(5, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"message_edit\",\n\"data\": [\n\"message_id\",\n@@ -94,36 +99,40 @@ class Handler:\n\"peer_id\",\n\"timestamp\",\n\"new_text\",\n- *self.additional_fields(5)\n- ]})\n+ *self.additional_fields(5),\n+ ],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef message_read_in(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(6, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"message_read_in\",\n- \"data\": [\n- \"peer_id\",\n- \"local_id\",\n- *self.additional_fields(6)\n- ]})\n+ \"data\": [\"peer_id\", \"local_id\", *self.additional_fields(6)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef message_read_out(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(7, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"message_read_out\",\n- \"data\": [\n- \"peer_id\",\n- \"local_id\",\n- *self.additional_fields(7)\n- ]})\n+ \"data\": [\"peer_id\", \"local_id\", *self.additional_fields(7)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n@@ -132,29 +141,38 @@ class Handler:\ndef friend_online(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(8, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"friend_online\",\n\"data\": [\n\"user_id\",\n\"extra\",\n\"timestamp\",\n- *self.additional_fields(8)\n- ]})\n+ *self.additional_fields(8),\n+ ],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef friend_offline(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(9, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"friend_offline\",\n\"data\": [\n\"user_id\",\n\"flags\",\n\"timestamp\",\n- *self.additional_fields(9)\n- ]})\n+ *self.additional_fields(9),\n+ ],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n@@ -163,13 +181,13 @@ class Handler:\ndef chat_flag_change(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(11, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"chat_flag_change\",\n- \"data\": [\n- \"peer_id\",\n- \"flags\",\n- *self.additional_fields(11)\n- ]})\n+ \"data\": [\"peer_id\", \"flags\", *self.additional_fields(11)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n@@ -178,13 +196,13 @@ class Handler:\ndef chat_flag_set(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(12, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"chat_flag_set\",\n- \"data\": [\n- \"peer_id\",\n- \"mask\",\n- *self.additional_fields(12)\n- ]})\n+ \"data\": [\"peer_id\", \"mask\", *self.additional_fields(12)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n@@ -193,13 +211,13 @@ class Handler:\ndef chat_flag_remove(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(10, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"chat_flag_remove\",\n- \"data\": [\n- \"peer_id\",\n- \"mask\",\n- *self.additional_fields(10)\n- ]})\n+ \"data\": [\"peer_id\", \"mask\", *self.additional_fields(10)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n@@ -208,159 +226,181 @@ class Handler:\ndef chat_remove(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(13, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"chat_remove\",\n- \"data\": [\n- \"peer_id\",\n- \"local_id\",\n- *self.additional_fields(13)\n- ]})\n+ \"data\": [\"peer_id\", \"local_id\", *self.additional_fields(13)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef chat_restore(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(14, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"chat_restore\",\n- \"data\": [\n- \"peer_id\",\n- \"local_id\",\n- *self.additional_fields(14)\n- ]})\n+ \"data\": [\"peer_id\", \"local_id\", *self.additional_fields(14)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef chat_edit(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(51, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"chat_edit\",\n- \"data\": [\n- \"chat_id\",\n- \"self\",\n- *self.additional_fields(51)\n- ]})\n+ \"data\": [\"chat_id\", \"self\", *self.additional_fields(51)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef chat_info_edit(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(52, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"chat_info_edit\",\n- \"data\": [\n- \"type_id\",\n- \"peer_id\",\n- \"info\",\n- *self.additional_fields(52)\n- ]})\n+ \"data\": [\"type_id\", \"peer_id\", \"info\", *self.additional_fields(52)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef message_typing_state(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(61, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"message_typing_state\",\n- \"data\": [\n- \"user_id\",\n- \"flags\",\n- *self.additional_fields(61)\n- ]})\n+ \"data\": [\"user_id\", \"flags\", *self.additional_fields(61)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef chat_typing_state(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(62, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"chat_typing_state\",\n- \"data\": [\n- \"user_id\",\n- \"chat_id\",\n- *self.additional_fields(62)\n- ]})\n+ \"data\": [\"user_id\", \"chat_id\", *self.additional_fields(62)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef chat_typing_states(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(63, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"chat_typing_states\",\n\"data\": [\n\"user_ids\",\n\"peer_id\",\n\"total_count\",\n\"ts\",\n- *self.additional_fields(63)\n- ]})\n+ *self.additional_fields(63),\n+ ],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef chat_voice_message_states(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(64, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"chat_voice_message_states\",\n\"data\": [\n\"user_ids\",\n\"peer_id\",\n\"total_count\",\n\"ts\",\n- *self.additional_fields(64)\n- ]})\n+ *self.additional_fields(64),\n+ ],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef call(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(70, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"call\",\n- \"data\": [\n- \"user_id\",\n- \"call_id\",\n- *self.additional_fields(70)\n- ]})\n+ \"data\": [\"user_id\", \"call_id\", *self.additional_fields(70)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef left_counter(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(80, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"left_counter\",\n- \"data\": [\n- \"counter\",\n- \"null\",\n- *self.additional_fields(80)\n- ]})\n+ \"data\": [\"counter\", \"null\", *self.additional_fields(80)],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\ndef notifications_settings_changed(self, *rules):\ndef decorator(func):\nrule = UserLongPollEventRule(114, *rules)\n- rule.create(func, {\n+ rule.create(\n+ func,\n+ {\n\"name\": \"notifications_settings_changed\",\n\"data\": [\n\"peer_id\",\n\"sound\",\n\"disabled_until\",\n- *self.additional_fields(114)\n- ]})\n+ *self.additional_fields(114),\n+ ],\n+ },\n+ )\nself.rules.append(rule)\nreturn func\n+\nreturn decorator\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/http/request.py",
"new_path": "vkbottle/http/request.py",
"diff": "@@ -45,11 +45,7 @@ class HTTPRequest:\ncontent_type: str = \"application/json\",\n):\nasync with client.post(\n- url,\n- params=params or {},\n- ssl=ssl.SSLContext(),\n- data=data,\n- json=json_,\n+ url, params=params or {}, ssl=ssl.SSLContext(), data=data, json=json_,\n) as response:\nreturn await response.json(content_type=content_type)\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/keyboard.py",
"new_path": "vkbottle/keyboard.py",
"diff": "-from .api.keyboard import (\n- Keyboard,\n- KeyboardButton,\n- keyboard_gen\n-)\n+from .api.keyboard import Keyboard, KeyboardButton, keyboard_gen\nfrom .api.keyboard.action import *\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/message.py",
"new_path": "vkbottle/types/message.py",
"diff": "@@ -72,12 +72,7 @@ class Message(BaseModel):\nclient_info: \"ClientInfo\" = None\nconversation_message_id: int = None\n- async def reply(\n- self,\n- message: str = None,\n- attachment: str = None,\n- **params\n- ):\n+ async def reply(self, message: str = None, attachment: str = None, **params):\nlocals().update(params)\nreturn await API().request(\n\"messages.send\",\n@@ -93,12 +88,7 @@ class Message(BaseModel):\n),\n)\n- async def __call__(\n- self,\n- message: str = None,\n- attachment: str = None,\n- **params\n- ):\n+ async def __call__(self, message: str = None, attachment: str = None, **params):\nlocals().update(params)\nfor message in sep_bytes(message or \"\"):\nm = await API().request(\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/types/user_longpoll.py",
"new_path": "vkbottle/types/user_longpoll.py",
"diff": "@@ -15,12 +15,7 @@ class Message(BaseModel):\nattachments: dict = None\nrandom_id: int = None\n- async def reply(\n- self,\n- message: str = None,\n- attachment: str = None,\n- **params\n- ):\n+ async def reply(self, message: str = None, attachment: str = None, **params):\nlocals().update(params)\nreturn await API().request(\n@@ -37,12 +32,7 @@ class Message(BaseModel):\n),\n)\n- async def __call__(\n- self,\n- message: str = None,\n- attachment: str = None,\n- **params\n- ):\n+ async def __call__(self, message: str = None, attachment: str = None, **params):\nlocals().update(params)\nfor message in sep_bytes(message or \"\"):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/task.py",
"new_path": "vkbottle/utils/task.py",
"diff": "@@ -105,5 +105,4 @@ class TaskManager:\nelif asyncio.iscoroutine(task):\nself.loop.create_task(task)\nelse:\n- raise RuntimeError(\n- \"Unexpected task. Tasks may be only coroutine functions\")\n+ raise RuntimeError(\"Unexpected task. Tasks may be only coroutine functions\")\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/utils/tools.py",
"new_path": "vkbottle/utils/tools.py",
"diff": "@@ -21,10 +21,7 @@ def dict_of_dicts_merge(d1, d2):\ndef except_none_self(adict: dict) -> dict:\nndict = {}\nfor k, v in adict.items():\n- if (\n- k not in [\"self\", \"cls\"]\n- and v is not None and not k.startswith(\"__\")\n- ):\n+ if k not in [\"self\", \"cls\"] and v is not None and not k.startswith(\"__\"):\nndict.update({k: v})\nreturn ndict\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 User LP error handling
+ reformatted by black |
718,838 | 02.02.2020 14:48:32 | -10,800 | 99872917a60e7c993ad7238dbb55b33e2bd99886 | v1 Examples Update | [
{
"change_type": "MODIFY",
"old_path": "examples/bot_decorators.py",
"new_path": "examples/bot_decorators.py",
"diff": "from vkbottle import Bot, Message\n-bot = Bot(token=\"token\", group_id=1, debug=True)\n+bot = Bot(\"token\")\n\"\"\"\nBot functions\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/callback_bot.py",
"new_path": "examples/callback_bot.py",
"diff": "@@ -4,7 +4,7 @@ from aiohttp.web import RouteTableDef, Application, Request, run_app\napp = Application()\nroutes = RouteTableDef()\n-bot = Bot(\"my-token\", 123, debug=True, secret=\"SecretKey\")\n+bot = Bot(\"my-token\", secret=\"SecretKey\")\n@routes.get(\"/bot\")\n"
},
{
"change_type": "MODIFY",
"old_path": "examples/longpoll_bot.py",
"new_path": "examples/longpoll_bot.py",
"diff": "from vkbottle import Bot, Message, keyboard_gen, types\n-bot = Bot(token=\"token\", group_id=1, debug=True)\n+bot = Bot(\"token\")\n\"\"\"\nBot functions\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "examples/raid.py",
"diff": "+from vkbottle import Bot, Message\n+from vkbottle.rule import VBMLRule\n+import vbml, asyncio\n+\n+bot = Bot(\"token\")\n+\n+\n+@bot.on.chat_message(VBMLRule(vbml.Pattern(\"/raid <text> <times:int>\", lazy=False)))\n+async def raid(ans: Message, text: str, times: int):\n+ for i in range(times):\n+ await ans(text)\n+ await asyncio.sleep(1)\n+\n+\n+bot.run_polling()\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Examples Update |
718,838 | 03.02.2020 17:26:01 | -10,800 | 99353e6e46a918404642cde84fcd90302a288eac | v1 Col Rules!
+ Levenstein Rule
+ Command Rule | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/api/exceptions.py",
"new_path": "vkbottle/api/exceptions.py",
"diff": "@@ -10,10 +10,6 @@ class KeyboardError(VKError):\npass\n-class MailingAPIError(Exception):\n- pass\n-\n-\nclass BranchError(Exception):\npass\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -80,6 +80,49 @@ class MessageRule(AbstractMessageRule):\nreturn True\n+class LevenshteinDisRule(AbstractMessageRule):\n+ def __init__(self, mixin: typing.Union[str, typing.List[str]], lev_d: float = 1):\n+ if not isinstance(mixin, list):\n+ mixin = [mixin]\n+ self.data = {\"samples\": mixin}\n+ self.lev = lev_d\n+\n+ @staticmethod\n+ def distance(a, b):\n+ n, m = len(a), len(b)\n+ if n > m:\n+ a, b = b, a\n+ n, m = m, n\n+\n+ current_row = range(n + 1)\n+ for i in range(1, m + 1):\n+ previous_row, current_row = current_row, [i] + [0] * n\n+ for j in range(1, n + 1):\n+ add, delete, change = previous_row[j] + 1, current_row[\n+ j - 1] + 1, previous_row[j - 1]\n+ if a[j - 1] != b[i - 1]:\n+ change += 1\n+ current_row[j] = min(add, delete, change)\n+\n+ return current_row[n]\n+\n+ async def check(self, message: Message):\n+ for sample in self.data[\"samples\"]:\n+ if self.distance(message.text, sample) <= self.lev:\n+ return True\n+\n+\n+class CommandRule(AbstractMessageRule):\n+ def __init__(self, message: typing.Union[str, typing.List[str]]):\n+ if isinstance(message, str):\n+ message = [message]\n+ self.data = {\"message\": [\"/\" + c for c in message]}\n+\n+ async def check(self, message: Message):\n+ if message.text in self.data[\"message\"]:\n+ return True\n+\n+\nclass EventRule(AbstractRule):\ndef __init__(self, event: typing.Union[str, typing.List[str]]):\nif isinstance(event, str):\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -16,8 +16,18 @@ from ..framework.rule import (\nChatMessage,\nPrivateMessage,\nAny,\n+ CommandRule,\n+ StickerRule,\n+ LevenshteinDisRule,\n)\n+COL_RULES = {\n+ \"commands\": CommandRule,\n+ \"sticker\": StickerRule,\n+ \"levenstein\": LevenshteinDisRule,\n+ \"lev\": LevenshteinDisRule,\n+}\n+\ndef should_ignore_ans(func: typing.Callable, arguments: list) -> bool:\nif not iscoroutinefunction(func):\n@@ -175,6 +185,14 @@ class MessageHandler:\nself.rules.append(current)\n+ def _col_rules(self, **col) -> typing.List[AbstractRule]:\n+ current = list()\n+ for k, v in col.items():\n+ if k not in COL_RULES:\n+ raise HandlerError(\"Col Rule {} is undefined\".format(k))\n+ current.append(COL_RULES[k](v))\n+ return current\n+\ndef _text_rule(\nself,\nfunc: typing.Callable,\n@@ -182,7 +200,7 @@ class MessageHandler:\nlower: bool,\ncommand: bool,\npattern: str,\n- ):\n+ ) -> AbstractRule:\nif not isinstance(text, Pattern):\nprefix = (\"[\" + \"|\".join(self.prefix) + \"]\") if command else \"\"\npattern = self._patcher.pattern(\n@@ -211,6 +229,7 @@ class MessageHandler:\nlower: bool = False,\ncommand: bool = False,\npattern: str = None,\n+ **col_rules\n):\n\"\"\"\nAdd handler to disself._patcher without decorators\n@@ -222,6 +241,7 @@ class MessageHandler:\n:return: True\n\"\"\"\ncurrent: typing.List[AbstractRule] = list(rules)\n+ current.extend(self._col_rules(**col_rules))\nif text:\ncurrent.append(\n@@ -249,6 +269,7 @@ class MessageHandler:\ntext: typing.Union[str, Pattern] = None,\ncommand: bool = False,\nlower: bool = False,\n+ **col_rules\n):\n\"\"\"\nSimple on.message(text) decorator. Support regex keys in text\n@@ -259,6 +280,7 @@ class MessageHandler:\ndef decorator(func):\ncurrent: typing.List[AbstractRule] = list(rules)\n+ current.extend(self._col_rules(**col_rules))\nif text:\ncurrent.append(self._text_rule(func, text, lower, command, \"{}$\"))\n@@ -274,6 +296,7 @@ class MessageHandler:\n*rules,\ncommand: bool = False,\nlower: bool = False,\n+ **col_rules\n):\n\"\"\"\nStartswith regex message processor\n@@ -288,6 +311,7 @@ class MessageHandler:\ndef decorator(func):\ncurrent: typing.List[AbstractRule] = list(rules)\n+ current.extend(self._col_rules(**col_rules))\nif text:\ncurrent.append(self._text_rule(func, text, lower, command, \"{}\"))\n@@ -329,6 +353,9 @@ class MessageHandler:\n)\nreturn str()\n+ def __str__(self):\n+ return self.__repr__()\n+\n@property\ndef default_rules(self):\nreturn [r.copy() for r in self._default_rules]\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Col Rules!
+ Levenstein Rule
+ Command Rule |
718,838 | 05.02.2020 18:01:58 | -10,800 | e68e0539d6d3a7fdcab28cd24e20519dd243bad6 | v1 Update README | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "```python\nfrom vkbottle import Bot, Message\n-bot = Bot('my-token', 123, debug=True)\n+bot = Bot(\"my-token\")\n-@bot.on.message(text='My name is <name>', lower=True)\n+@bot.on.message(text=\"My name is <name>\", lower=True)\nasync def wrapper(ans: Message, name):\n- await ans('Hello, {}'.format(name))\n+ await ans(\"Hello, {}\".format(name))\nbot.run_polling()\n@@ -55,13 +55,13 @@ from aiohttp.web import RouteTableDef, Application, Request, run_app\napp = Application()\nroutes = RouteTableDef()\n-bot = Bot('my-token', 123, debug=True, secret=\"SecretKey\")\n+bot = Bot(\"my-token\", secret=\"SecretKey\")\n-@routes.get('/bot')\n+@routes.get(\"/bot\")\nasync def executor(request: Request):\nreturn await bot.emulate(event=dict(request.query), confirmation_token=\"ConfirmationToken\")\n-@bot.on.message(text='test', lower=True)\n+@bot.on.message(text=\"test\", lower=True)\nasync def wrapper():\nreturn \"test\"\n@@ -75,7 +75,7 @@ run_app(app)\nfrom vkbottle import Bot, Message\nfrom vkbottle.rule import AttachmentRule\n-bot = Bot(\"my-token\", 123, debug=True)\n+bot = Bot(\"my-token\")\n@bot.on.message(AttachmentRule(\"photo\"))\nasync def wrapper():\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -102,15 +102,15 @@ class Bot(HTTP, EventProcessor):\nraise VKError(\"Token is invalid\")\nreturn response[\"response\"][0][\"id\"]\n- def _check_secret(self, secret: str):\n+ def _check_secret(self, event: dict):\n\"\"\"\nMatch secret code with current secret\n:param secret:\n:return:\n\"\"\"\nif self.__secret:\n- return secret == self.__secret\n- return None\n+ return event.get(\"secret\") == self.__secret\n+ return True\ndef set_debug(self, debug: bool, **params):\n\"\"\"\n@@ -249,8 +249,7 @@ class Bot(HTTP, EventProcessor):\nreturn confirmation_token or \"dissatisfied\"\nupdates = event.get(\"updates\", [event])\n- if \"secret\" in event:\n- if not self._check_secret(event[\"secret\"]):\n+ if not self._check_secret(event):\nreturn \"access denied\"\ntry:\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Update README |
718,838 | 05.02.2020 20:21:04 | -10,800 | 4da93c77f26f8e1c51a024237ee676a58f32e8f2 | v1 Little bull fixes | [
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/bot.py",
"new_path": "vkbottle/framework/bot.py",
"diff": "@@ -30,7 +30,7 @@ class DefaultValidators(PatchedValidators):\nclass Bot(HTTP, EventProcessor):\n- longPollServer: dict\n+ long_poll_server: dict\ndef __init__(\nself,\n@@ -78,7 +78,7 @@ class Bot(HTTP, EventProcessor):\n# Main workers\nself.branch: BranchManager = BranchManager(plugin_folder or DEFAULT_BOT_FOLDER)\n- self.on: Handler = Handler(self._logger, group_id)\n+ self.on: Handler = Handler(self._logger, self.group_id)\nself.error_handler: ErrorHandler = ErrorHandler()\ndef dispatch(self, ext: \"Bot\"):\n@@ -105,7 +105,7 @@ class Bot(HTTP, EventProcessor):\ndef _check_secret(self, event: dict):\n\"\"\"\nMatch secret code with current secret\n- :param secret:\n+ :param event:\n:return:\n\"\"\"\nif self.__secret:\n@@ -181,10 +181,10 @@ class Bot(HTTP, EventProcessor):\nGet longPoll server for long request create\n:return: LongPoll Server\n\"\"\"\n- self.longPollServer = await self.api.groups.getLongPollServer(\n+ self.long_poll_server = await self.api.groups.getLongPollServer(\ngroup_id=self.group_id\n)\n- return self.longPollServer\n+ return self.long_poll_server\nasync def make_long_request(self, long_poll_server: dict) -> dict:\n\"\"\"\n@@ -223,7 +223,7 @@ class Bot(HTTP, EventProcessor):\nwhile True:\ntry:\n- event = await self.make_long_request(self.longPollServer)\n+ event = await self.make_long_request(self.long_poll_server)\nif isinstance(event, dict):\nself.loop.create_task(self.emulate(event))\nawait self.get_server()\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/rule/rule.py",
"new_path": "vkbottle/framework/rule/rule.py",
"diff": "@@ -6,6 +6,7 @@ from vbml import Pattern, Patcher\nfrom ...types import Message, BaseModel\nfrom ...types import user_longpoll\n+from ...utils import flatten\nclass Copy:\n@@ -98,8 +99,11 @@ class LevenshteinDisRule(AbstractMessageRule):\nfor i in range(1, m + 1):\nprevious_row, current_row = current_row, [i] + [0] * n\nfor j in range(1, n + 1):\n- add, delete, change = previous_row[j] + 1, current_row[\n- j - 1] + 1, previous_row[j - 1]\n+ add, delete, change = (\n+ previous_row[j] + 1,\n+ current_row[j - 1] + 1,\n+ previous_row[j - 1],\n+ )\nif a[j - 1] != b[i - 1]:\nchange += 1\ncurrent_row[j] = min(add, delete, change)\n@@ -212,10 +216,10 @@ class VBMLUserRule(AbstractUserRule, VBML):\nclass AttachmentRule(UnionMixin):\nasync def check(self, message: Message):\n- attachments = [\n- list(attachment.dict(skip_defaults=True).keys())[0]\n+ attachments = flatten([\n+ list(attachment.dict(skip_defaults=True).keys())\nfor attachment in message.attachments\n- ]\n+ ])\nif attachments and not self.data[\"mixin\"]:\n# ANY ATTACHMENTS\nreturn True\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/framework/user.py",
"new_path": "vkbottle/framework/user.py",
"diff": "@@ -16,7 +16,7 @@ MODE = 2\nclass User(HTTP):\n- longPollServer: dict\n+ long_poll_server: dict\n__wait: int\n_mode: int = None\nversion: int = None\n@@ -56,27 +56,27 @@ class User(HTTP):\nGet longPoll server for long request creation\n:return:\n\"\"\"\n- self.longPollServer = await self.api.messages.getLongPollServer()\n- return self.longPollServer\n+ self.long_poll_server = await self.api.messages.getLongPollServer()\n+ return self.long_poll_server\n- async def make_long_request(self, longPollServer: dict) -> dict:\n+ async def make_long_request(self, long_poll_server: dict) -> dict:\n\"\"\"\nMake longPoll request to the VK Server\n- :param longPollServer:\n+ :param long_poll_server:\n:return: VK LongPoll Event\n\"\"\"\ntry:\nurl = \"https://{}?act=a_check&key={}&ts={}&wait={}&mode={}&version={}\".format(\n- longPollServer[\"server\"],\n- longPollServer[\"key\"],\n- longPollServer[\"ts\"],\n+ long_poll_server[\"server\"],\n+ long_poll_server[\"key\"],\n+ long_poll_server[\"ts\"],\nself.__wait or DEFAULT_WAIT,\nself.mode or MODE,\nself.version or VERSION,\n)\nreturn await self.request.post(url)\nexcept TimeoutError:\n- return await self.make_long_request(longPollServer)\n+ return await self.make_long_request(long_poll_server)\nasync def run(self, wait: int = DEFAULT_WAIT):\nself.__wait = wait\n@@ -87,7 +87,7 @@ class User(HTTP):\nwhile True:\ntry:\n- event = await self.make_long_request(self.longPollServer)\n+ event = await self.make_long_request(self.long_poll_server)\nif isinstance(event, dict):\nself.__loop.create_task(self.emulate(event))\nawait self.get_server()\n@@ -100,8 +100,14 @@ class User(HTTP):\n# No internet connection\nawait self._logger.warning(\"Server Timeout Error!\")\n+ except:\n+ self._logger.error(\n+ \"While user lp worked error occurred TIME %#%\\n\\n{}\".format(\n+ traceback.format_exc()\n+ )\n+ )\n+\nasync def emulate(self, event: dict):\n- try:\nfor update in event.get(\"updates\", []):\nupdate_fields = update[1:]\nfor rule in self.on.rules:\n@@ -124,12 +130,6 @@ class User(HTTP):\ncontinue\nawait rule.call(data, *args, **kwargs)\n- except:\n- self._logger.error(\n- \"While user lp worked error occurred TIME %#%\\n\\n{}\".format(\n- traceback.format_exc()\n- )\n- )\ndef run_polling(self):\nloop = self.__loop\n"
},
{
"change_type": "MODIFY",
"old_path": "vkbottle/handler/handler.py",
"new_path": "vkbottle/handler/handler.py",
"diff": "@@ -37,11 +37,13 @@ def should_ignore_ans(func: typing.Callable, arguments: list) -> bool:\nclass Handler:\ndef __init__(self, logger: Logger, group_id: int = 0):\n- self.__group_id: int = group_id\n+ self.group_id: int = group_id\nself.__logger = logger\nself.rules: typing.List[typing.List[AbstractRule]] = list()\n- self.message: MessageHandler = MessageHandler(default_rules=[PrivateMessage()])\n+ self.message: MessageHandler = MessageHandler(\n+ default_rules=[PrivateMessage()]\n+ )\nself.chat_message: MessageHandler = MessageHandler(\ndefault_rules=[ChatMessage()]\n)\n@@ -115,7 +117,7 @@ class Handler:\ndef decorator(func):\nrule = ChatActionRule(type_, rules=rules)\nrule.create(func)\n- self.chat_message.rules.append([rule])\n+ self.chat_message.add_rules([rule], func)\nreturn func\nreturn decorator\n@@ -123,22 +125,22 @@ class Handler:\ndef chat_mention(self):\ndef decorator(func):\npattern = self._patcher.pattern(\n- pattern=\"\", _pattern=r\"\\[(club|public){}\\|.*?]\".format(self.__group_id)\n+ pattern=\"\", _pattern=r\"\\[(club|public){}\\|.*?]\".format(self.group_id)\n)\nignore_ans = len(signature(func).parameters) < 1\nrule = VBMLRule(pattern)\nrule.create(func, {\"ignore_ans\": ignore_ans})\n- self.chat_message.rules.append([rule])\n+ self.chat_message.add_rules([rule], func)\nreturn func\nreturn decorator\ndef chat_invite(self):\ndef decorator(func):\n- rule = ChatActionRule(\"chat_invite_user\", {\"member_id\": -self.__group_id})\n+ rule = ChatActionRule(\"chat_invite_user\", {\"member_id\": -self.group_id})\nrule.create(func)\n- self.chat_message.rules.append([rule])\n+ self.chat_message.add_rules([rule], func)\nreturn func\nreturn decorator\n@@ -229,7 +231,7 @@ class MessageHandler:\nlower: bool = False,\ncommand: bool = False,\npattern: str = None,\n- **col_rules\n+ **col_rules,\n):\n\"\"\"\nAdd handler to disself._patcher without decorators\n@@ -269,7 +271,7 @@ class MessageHandler:\ntext: typing.Union[str, Pattern] = None,\ncommand: bool = False,\nlower: bool = False,\n- **col_rules\n+ **col_rules,\n):\n\"\"\"\nSimple on.message(text) decorator. Support regex keys in text\n@@ -296,7 +298,7 @@ class MessageHandler:\n*rules,\ncommand: bool = False,\nlower: bool = False,\n- **col_rules\n+ **col_rules,\n):\n\"\"\"\nStartswith regex message processor\n"
}
] | Python | MIT License | vkbottle/vkbottle | v1 Little bull fixes |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.