From bfc90208788bce3d2867dd13b59f7dc3a878873a Mon Sep 17 00:00:00 2001 From: m-vdb Date: Tue, 28 Apr 2020 18:05:51 +0200 Subject: [PATCH 01/11] strip ref/tags/ from GITHUB_TAG var in workflow --- .github/workflows/continous-integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/continous-integration.yml b/.github/workflows/continous-integration.yml index ad78044cc..66345b30d 100644 --- a/.github/workflows/continous-integration.yml +++ b/.github/workflows/continous-integration.yml @@ -145,6 +145,7 @@ jobs: GITHUB_REPO_SLUG: ${{ github.repository }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + GITHUB_TAG=${GITHUB_TAG/refs\/tags\//} sudo apt-get update sudo apt-get -y install pandoc pip install -U github3.py pypandoc From 33863c8e2118eeeabe705936d39b33541cf03edb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 29 Apr 2020 16:41:06 +0000 Subject: [PATCH 02/11] Bump semantic-version from 2.8.4 to 2.8.5 Bumps [semantic-version](https://github.com/rbarrois/python-semanticversion) from 2.8.4 to 2.8.5. - [Release notes](https://github.com/rbarrois/python-semanticversion/releases) - [Changelog](https://github.com/rbarrois/python-semanticversion/blob/master/ChangeLog) - [Commits](https://github.com/rbarrois/python-semanticversion/compare/2.8.4...2.8.5) Signed-off-by: dependabot-preview[bot] --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index afd534e8c..686cad5dd 100644 --- a/poetry.lock +++ b/poetry.lock @@ -722,7 +722,7 @@ description = "A library implementing the 'SemVer' scheme." name = "semantic-version" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.8.4" +version = "2.8.5" [[package]] category = "dev" @@ -857,7 +857,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["jaraco.itertools", "func-timeout"] [metadata] -content-hash = "33e39927b9775160be47f9b36d310d3400f4c356e02a4b1b75877bf0c010fa6c" +content-hash = "74c4328f8811c93c2699a47a06ff1ad19502bfe91db2c70bf87d3b781119ace8" python-versions = "^3.6" [metadata.files] @@ -1252,8 +1252,8 @@ sanic-plugins-framework = [ {file = "Sanic_Plugins_Framework-0.9.2-py2.py3-none-any.whl", hash = "sha256:2949374e414a497a3b07b09800d3d0b3cdf24f3a1d3f08591488759099cb7f44"}, ] semantic-version = [ - {file = "semantic_version-2.8.4-py2.py3-none-any.whl", hash = "sha256:4eedff095ecdd7790a9e6d7130d49250209e0c7bf6741423c4a4017d9bac4c04"}, - {file = "semantic_version-2.8.4.tar.gz", hash = "sha256:352459f640f3db86551d8054d1288608b29a96e880c7746f0a59c92879d412a3"}, + {file = "semantic_version-2.8.5-py2.py3-none-any.whl", hash = "sha256:45e4b32ee9d6d70ba5f440ec8cc5221074c7f4b0e8918bdab748cc37912440a9"}, + {file = "semantic_version-2.8.5.tar.gz", hash = "sha256:d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"}, ] six = [ {file = "six-1.14.0-py2.py3-none-any.whl", hash = "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c"}, diff --git a/pyproject.toml b/pyproject.toml index d7fa82a67..50838ab0b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,4 +78,4 @@ pytest-sanic = "^1.6.1" questionary = "^1.5.2" towncrier = "^19.2.0" toml = "^0.10.0" -semantic_version = "^2.8.4" +semantic_version = "^2.8.5" From baa7db4b8f3ce9a95c84b869ca81d8a925df5725 Mon Sep 17 00:00:00 2001 From: Tom Bocklisch Date: Thu, 30 Apr 2020 11:01:13 +0200 Subject: [PATCH 03/11] bump version to 2.0 --- pyproject.toml | 2 +- rasa_sdk/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d7fa82a67..866b2a216 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api" [tool.poetry] name = "rasa-sdk" -version = "1.10.0" +version = "2.0.0a1" description = "Open source machine learning framework to automate text- and voice-based conversations: NLU, dialogue management, connect to Slack, Facebook, and more - Create chatbots and voice assistants" authors = [ "Rasa Technologies GmbH ",] maintainers = [ "Tom Bocklisch ",] diff --git a/rasa_sdk/version.py b/rasa_sdk/version.py index 8a952ec29..628ab1e8b 100644 --- a/rasa_sdk/version.py +++ b/rasa_sdk/version.py @@ -1,3 +1,3 @@ # this file will automatically be changed, # do not add anything but the version number here! -__version__ = "1.10.0" +__version__ = "2.0.0a1" From 85f39c3eb5d943bd4e1b68e63c7e55c23eb944fd Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Thu, 30 Apr 2020 09:11:36 -0300 Subject: [PATCH 04/11] updated method signature and typo in docs --- rasa_sdk/interfaces.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rasa_sdk/interfaces.py b/rasa_sdk/interfaces.py index c2a62dbcb..303c0470d 100644 --- a/rasa_sdk/interfaces.py +++ b/rasa_sdk/interfaces.py @@ -1,8 +1,9 @@ import copy import logging -import typing from typing import Any, Dict, Iterator, List, Optional, Text +from rasa_sdk.executor import CollectingDispatcher + logger = logging.getLogger(__name__) ACTION_LISTEN_NAME = "action_listen" @@ -230,14 +231,17 @@ def name(self) -> Text: raise NotImplementedError("An action must implement a name") async def run( - self, dispatcher, tracker: Tracker, domain: Dict[Text, Any] + self, + dispatcher: CollectingDispatcher, + tracker: Tracker, + domain: Dict[Text, Any], ) -> List[Dict[Text, Any]]: """Execute the side effects of this action. Args: dispatcher: the dispatcher which is used to send messages back to the user. Use - ``dipatcher.utter_message()`` or any other + ``dispatcher.utter_message()`` or any other ``rasa_sdk.executor.CollectingDispatcher`` method. tracker: the state tracker for the current From a11b533743bcdf1f5c75ed369ba98bef9343775e Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Fri, 1 May 2020 00:49:30 -0300 Subject: [PATCH 05/11] updated docs for method run in interfaces.py --- rasa_sdk/executor.py | 1 - rasa_sdk/interfaces.py | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/rasa_sdk/executor.py b/rasa_sdk/executor.py index 7c441b9db..31bfd24a1 100644 --- a/rasa_sdk/executor.py +++ b/rasa_sdk/executor.py @@ -5,7 +5,6 @@ import warnings from typing import Text, List, Dict, Any, Type, Union, Callable, Optional from collections import namedtuple -import typing import types import sys import os diff --git a/rasa_sdk/interfaces.py b/rasa_sdk/interfaces.py index 303c0470d..23cc3db8b 100644 --- a/rasa_sdk/interfaces.py +++ b/rasa_sdk/interfaces.py @@ -241,9 +241,7 @@ async def run( Args: dispatcher: the dispatcher which is used to send messages back to the user. Use - ``dispatcher.utter_message()`` or any other - ``rasa_sdk.executor.CollectingDispatcher`` - method. + ``dispatcher.utter_message()`` for sending messages tracker: the state tracker for the current user. You can access slot values using ``tracker.get_slot(slot_name)``, the most recent user message From 5a85a81525419ebf3156215d56779f6591b17ac0 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Mon, 4 May 2020 21:02:11 -0300 Subject: [PATCH 06/11] Typo in docstring Co-authored-by: Ella Rohm-Ensing --- rasa_sdk/interfaces.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rasa_sdk/interfaces.py b/rasa_sdk/interfaces.py index 23cc3db8b..9e7d2cfea 100644 --- a/rasa_sdk/interfaces.py +++ b/rasa_sdk/interfaces.py @@ -241,7 +241,7 @@ async def run( Args: dispatcher: the dispatcher which is used to send messages back to the user. Use - ``dispatcher.utter_message()`` for sending messages + ``dispatcher.utter_message()`` for sending messages. tracker: the state tracker for the current user. You can access slot values using ``tracker.get_slot(slot_name)``, the most recent user message From 2dbefcd2e087e2e9756dc6b2a969abc60db81397 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Tue, 5 May 2020 13:30:12 -0300 Subject: [PATCH 07/11] Update interfaces.py removed the typing from the `dispatcher` parameter --- rasa_sdk/interfaces.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rasa_sdk/interfaces.py b/rasa_sdk/interfaces.py index 9e7d2cfea..6a811d92d 100644 --- a/rasa_sdk/interfaces.py +++ b/rasa_sdk/interfaces.py @@ -2,8 +2,6 @@ import logging from typing import Any, Dict, Iterator, List, Optional, Text -from rasa_sdk.executor import CollectingDispatcher - logger = logging.getLogger(__name__) ACTION_LISTEN_NAME = "action_listen" @@ -232,7 +230,7 @@ def name(self) -> Text: async def run( self, - dispatcher: CollectingDispatcher, + dispatcher, tracker: Tracker, domain: Dict[Text, Any], ) -> List[Dict[Text, Any]]: From a4fb2f5ab84af2248f1b1e03814371f591ebf6ee Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Tue, 5 May 2020 13:32:17 -0300 Subject: [PATCH 08/11] linting --- rasa_sdk/interfaces.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rasa_sdk/interfaces.py b/rasa_sdk/interfaces.py index 6a811d92d..be86e918a 100644 --- a/rasa_sdk/interfaces.py +++ b/rasa_sdk/interfaces.py @@ -229,10 +229,7 @@ def name(self) -> Text: raise NotImplementedError("An action must implement a name") async def run( - self, - dispatcher, - tracker: Tracker, - domain: Dict[Text, Any], + self, dispatcher, tracker: Tracker, domain: Dict[Text, Any], ) -> List[Dict[Text, Any]]: """Execute the side effects of this action. From bab7cdbe98d0b1d62e5acb79105d7285d79a29b3 Mon Sep 17 00:00:00 2001 From: Ella Rohm-Ensing Date: Thu, 7 May 2020 16:38:06 +0200 Subject: [PATCH 09/11] update docker instructions with permissions --- README.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bfc188643..49bf669ae 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Detailed instructions can be found in the Rasa Documentation about ### Usage In order to start an action server using implemented custom actions, -you can use the available Docker image `rasa/rasa-sdk:latest`. +you can use the available Docker image `rasa/rasa-sdk`. Before starting the action server ensure that the folder containing your actions is handled as Python module and therefore has to contain @@ -51,7 +51,7 @@ Then start the action server using: ```bash docker run -p 5055:5055 --mount type=bind,source=,target=/app/actions \ - rasa/rasa-sdk:latest + rasa/rasa-sdk: ``` The action server is then available at `http://localhost:5055/webhook`. @@ -61,7 +61,11 @@ The action server is then available at `http://localhost:5055/webhook`. To add custom dependencies you enhance the given Docker image, e.g.: ``` -FROM rasa/rasa-sdk:latest +# Extend the official Rasa SDK image +FROM rasa/rasa-sdk: + +# Change back to root user to install dependencies +USER root # To install system dependencies RUN apt-get update -qq && \ @@ -71,6 +75,9 @@ RUN apt-get update -qq && \ # To install packages from PyPI RUN pip install --no-cache-dir + +# Switch back to non-root to run code +USER 1001 ``` From 77f0ebdcd0383b6b3d81fe2a9eaea2377053049e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2020 21:40:15 +0000 Subject: [PATCH 10/11] Bump flake8 from 3.7.9 to 3.8.2 Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.7.9 to 3.8.2. - [Release notes](https://gitlab.com/pycqa/flake8/tags) - [Commits](https://gitlab.com/pycqa/flake8/compare/3.7.9...3.8.2) Signed-off-by: dependabot-preview[bot] --- poetry.lock | 45 ++++++++++++++++++--------------------------- pyproject.toml | 2 +- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/poetry.lock b/poetry.lock index 686cad5dd..88495eba7 100644 --- a/poetry.lock +++ b/poetry.lock @@ -203,25 +203,20 @@ version = "0.6.2" [[package]] category = "dev" -description = "Discover and load entry points from installed packages." -name = "entrypoints" -optional = false -python-versions = ">=2.7" -version = "0.3" - -[[package]] -category = "dev" -description = "the modular source code checker: pep8, pyflakes and co" +description = "the modular source code checker: pep8 pyflakes and co" name = "flake8" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "3.7.9" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +version = "3.8.2" [package.dependencies] -entrypoints = ">=0.3.0,<0.4.0" mccabe = ">=0.6.0,<0.7.0" -pycodestyle = ">=2.5.0,<2.6.0" -pyflakes = ">=2.1.0,<2.2.0" +pycodestyle = ">=2.6.0a1,<2.7.0" +pyflakes = ">=2.2.0,<2.3.0" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" [[package]] category = "main" @@ -514,7 +509,7 @@ description = "Python style guide checker" name = "pycodestyle" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.5.0" +version = "2.6.0" [[package]] category = "dev" @@ -522,7 +517,7 @@ description = "passive checker of Python programs" name = "pyflakes" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.1.1" +version = "2.2.0" [[package]] category = "dev" @@ -857,7 +852,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["jaraco.itertools", "func-timeout"] [metadata] -content-hash = "74c4328f8811c93c2699a47a06ff1ad19502bfe91db2c70bf87d3b781119ace8" +content-hash = "3b6bc1176aab9d600ee3a706fc38deea47da274885ccbf10c36f823198ef1f15" python-versions = "^3.6" [metadata.files] @@ -970,13 +965,9 @@ decorator = [ docopt = [ {file = "docopt-0.6.2.tar.gz", hash = "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"}, ] -entrypoints = [ - {file = "entrypoints-0.3-py2.py3-none-any.whl", hash = "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19"}, - {file = "entrypoints-0.3.tar.gz", hash = "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"}, -] flake8 = [ - {file = "flake8-3.7.9-py2.py3-none-any.whl", hash = "sha256:49356e766643ad15072a789a20915d3c91dc89fd313ccd71802303fd67e4deca"}, - {file = "flake8-3.7.9.tar.gz", hash = "sha256:45681a117ecc81e870cbf1262835ae4af5e7a8b08e40b944a8a6e6b895914cfb"}, + {file = "flake8-3.8.2-py2.py3-none-any.whl", hash = "sha256:ccaa799ef9893cebe69fdfefed76865aeaefbb94cb8545617b2298786a4de9a5"}, + {file = "flake8-3.8.2.tar.gz", hash = "sha256:c69ac1668e434d37a2d2880b3ca9aafd54b3a10a3ac1ab101d22f29e29cf8634"}, ] h11 = [ {file = "h11-0.8.1-py2.py3-none-any.whl", hash = "sha256:f2b1ca39bfed357d1f19ac732913d5f9faa54a5062eca7d2ec3a916cfb7ae4c7"}, @@ -1160,12 +1151,12 @@ py = [ {file = "py-1.8.1.tar.gz", hash = "sha256:5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa"}, ] pycodestyle = [ - {file = "pycodestyle-2.5.0-py2.py3-none-any.whl", hash = "sha256:95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56"}, - {file = "pycodestyle-2.5.0.tar.gz", hash = "sha256:e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"}, + {file = "pycodestyle-2.6.0-py2.py3-none-any.whl", hash = "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367"}, + {file = "pycodestyle-2.6.0.tar.gz", hash = "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"}, ] pyflakes = [ - {file = "pyflakes-2.1.1-py2.py3-none-any.whl", hash = "sha256:17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0"}, - {file = "pyflakes-2.1.1.tar.gz", hash = "sha256:d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"}, + {file = "pyflakes-2.2.0-py2.py3-none-any.whl", hash = "sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92"}, + {file = "pyflakes-2.2.0.tar.gz", hash = "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"}, ] pyparsing = [ {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, diff --git a/pyproject.toml b/pyproject.toml index a1d425c16..e6877ca01 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,7 +72,7 @@ pytest-cov = "^2.8.1" coveralls = "^2.0.0" pytest = "^5.4.1" black = "^19.10b0" -flake8 = "^3.7.9" +flake8 = "^3.8.2" pytype = "^2020.1.24" pytest-sanic = "^1.6.1" questionary = "^1.5.2" From 18141e180dcf6c790ddb1bfa8aa0e4b590dbb23b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 08:24:15 +0000 Subject: [PATCH 11/11] Create Dependabot config file --- .github/dependabot.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..a6b68a02d --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,14 @@ +version: 2 +updates: +- package-ecosystem: pip + directory: "/" + schedule: + interval: monthly + time: '13:00' + pull-request-branch-name: + separator: "-" + open-pull-requests-limit: 10 + reviewers: + - alwx + labels: + - type:dependencies