Skip to content

Commit

Permalink
Merge branch 'master' into 1.10.x-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
erohmensing committed Jun 25, 2020
2 parents a1616b3 + e8a4e55 commit d8b70b5
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 38 deletions.
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .github/workflows/continous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -51,7 +51,7 @@ Then start the action server using:

```bash
docker run -p 5055:5055 --mount type=bind,source=<ABSOLUTE_PATH_TO_YOUR_ACTIONS>,target=/app/actions \
rasa/rasa-sdk:latest
rasa/rasa-sdk:<version>
```

The action server is then available at `http://localhost:5055/webhook`.
Expand All @@ -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:<version>
# Change back to root user to install dependencies
USER root
# To install system dependencies
RUN apt-get update -qq && \
Expand All @@ -71,6 +75,9 @@ RUN apt-get update -qq && \
# To install packages from PyPI
RUN pip install --no-cache-dir <A_REQUIRED_PACKAGE_ON_PYPI>
# Switch back to non-root to run code
USER 1001
```


Expand Down
47 changes: 21 additions & 26 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"

[tool.poetry]
name = "rasa-sdk"
version = "1.10.2"
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 <[email protected]>",]
maintainers = [ "Tom Bocklisch <[email protected]>",]
Expand Down Expand Up @@ -72,10 +72,11 @@ 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"
towncrier = "^19.2.0"
toml = "^0.10.0"
pep440-version-utils = "^0.3.0"
semantic_version = "^2.8.5"
1 change: 0 additions & 1 deletion rasa_sdk/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import warnings
from typing import Text, List, Dict, Any, Type, Union, Callable, Optional, Set
from collections import namedtuple
import typing
import types
import sys
import os
Expand Down
7 changes: 2 additions & 5 deletions rasa_sdk/interfaces.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import copy
import logging
import typing
from typing import Any, Dict, Iterator, List, Optional, Text

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -230,16 +229,14 @@ 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.
Args:
dispatcher: the dispatcher which is used to
send messages back to the user. Use
``dipatcher.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
Expand Down
2 changes: 1 addition & 1 deletion rasa_sdk/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# this file will automatically be changed,
# do not add anything but the version number here!
__version__ = "1.10.2"
__version__ = "2.0.0a1"

0 comments on commit d8b70b5

Please sign in to comment.