Switch to mypy part0

.gitignore

@@ -15,7 +15,7 @@ venv
 .ipynb_checkpoints
 .ruby-version
 .tox
-.pytype
+.mypy_cache/
 dist/
 pip-wheel-metadata
 server/

CONTRIBUTING.md

@@ -85,15 +85,15 @@ If your PR is greater than 500 lines, please consider splitting it into multiple
 
 #### Code style
 
-To ensure a standardized code style we recommend using formatter black. To ensure our type annotations are correct we also suggest using the type checker pytype.
+To ensure a standardized code style we recommend using formatter black. To ensure our type annotations are correct we also suggest using the type checker `mypy`.
 
 #### Formatting and Type Checking
 
 If you want to automatically format your code on every commit, you can use pre-commit. Just install it via `pip install pre-commit` and execute `pre-commit install` in the root folder. This will add a hook to the repository, which reformats files on every commit.
 
 If you want to set it up manually, install black via `pip install -r requirements-dev.txt.` To reformat files execute `make formatter`.
 
-If you want to check types on the codebase, install pytype using `pip install -r requirements-dev.txt`. To check the types execute `make types`.
+If you want to check types on the codebase, install `mypy` using `poetry install`. To check the types execute `make types`.
 
 The CI/CD tests that we run can be found in the [continous-integration.yml](https://github.com/RasaHQ/rasa/blob/master/.github/workflows/continous-integration.yml) file. 
 

Makefile

@@ -15,7 +15,7 @@ help:
 	@echo "    lint"
 	@echo "        Lint code with flake8, and check if black formatter should be applied."
 	@echo "    types"
-	@echo "        Check for type errors using pytype."
+	@echo "        Check for type errors using mypy."
 	@echo "    prepare-tests-ubuntu"
 	@echo "        Install system requirements for running tests on Ubuntu and Debian based systems."
 	@echo "    prepare-tests-macos"
@@ -37,7 +37,7 @@ clean:
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f  {} +
 	rm -rf build/
-	rm -rf .pytype/
+	rm -rf .mypy_cache/
 	rm -rf dist/
 	rm -rf docs/build
 	rm -rf docs/.docusaurus
@@ -63,7 +63,28 @@ lint:
 	poetry run black --check rasa tests
 
 types:
-	poetry run pytype --keep-going rasa -j 16
+	# FIXME: working our way towards removing these
+	# see https://github.com/RasaHQ/rasa/pull/6470
+	# the list below is sorted by the number of errors for each error code, in decreasing order
+	poetry run mypy rasa --disable-error-code arg-type \
+	--disable-error-code assignment \
+	--disable-error-code var-annotated \
+	--disable-error-code return-value \
+	--disable-error-code union-attr \
+	--disable-error-code override \
+	--disable-error-code operator \
+	--disable-error-code attr-defined \
+	--disable-error-code index \
+	--disable-error-code misc \
+	--disable-error-code return \
+	--disable-error-code call-arg \
+	--disable-error-code type-var \
+	--disable-error-code list-item \
+	--disable-error-code has-type \
+	--disable-error-code valid-type \
+	--disable-error-code dict-item \
+	--disable-error-code no-redef \
+	--disable-error-code func-returns-value
 
 prepare-tests-files:
 	poetry install -E spacy

README.md

@@ -251,7 +251,7 @@ make formatter
 
 #### Type Checking
 
-If you want to check types on the codebase, install `pytype` using `poetry install`.
+If you want to check types on the codebase, install `mypy` using `poetry install`.
 To check the types execute
 ```
 make types

changelog/6470.misc.md

@@ -0,0 +1,2 @@
+Python type checks are now run using `mypy` instead of `pytype`,
+resulting in great performance gains and increased accuracy.

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.masonry.api"
 [tool.black]
 line-length = 88
 target-version = [ "py36", "py37", "py38",]
-exclude = "((.eggs | .git | .pytype | .pytest_cache | build | dist))"
+exclude = "((.eggs | .git | .pytest_cache | build | dist))"
 
 [tool.poetry]
 name = "rasa"
@@ -143,7 +143,6 @@ fakeredis = "^1.4.0"
 mongomock = "^3.18.0"
 black = "^19.10b0"
 flake8 = "^3.8.3"
-pytype = "^2020.6.1"
 google-cloud-storage = "^1.29.0"
 azure-storage-blob = "<12.6.0"
 coveralls = "^2.0.0"
@@ -152,6 +151,7 @@ toml = "^0.10.0"
 pep440-version-utils = "^0.3.0"
 pydoc-markdown = "^3.5.0"
 pytest-timeout = "^1.4.2"
+mypy = "^0.790"
 
 [tool.poetry.extras]
 spacy = [ "spacy",]

rasa/__main__.py

@@ -77,7 +77,7 @@ def print_version() -> None:
 
     python_version, os_info = sys.version.split("\n")
     try:
-        from rasax.community.version import __version__  # pytype: disable=import-error
+        from rasax.community.version import __version__  # rasa-16-to-rasa-17
 
         rasa_x_info = __version__
     except ModuleNotFoundError:

rasa/cli/train.py

@@ -215,4 +215,4 @@ def _get_valid_config(
         )
         sys.exit(1)
 
-    return config  # pytype: disable=bad-return-type
+    return config  # rasa-16-to-rasa-17

rasa/cli/x.py

@@ -425,7 +425,7 @@ def _get_credentials_and_endpoints_paths(
 def run_locally(args: argparse.Namespace):
     try:
         # noinspection PyUnresolvedReferences
-        from rasax.community import local  # pytype: disable=import-error
+        from rasax.community import local  # rasa-16-to-rasa-17
     except ModuleNotFoundError:
         raise MissingDependencyException(
             f"Rasa X does not seem to be installed, but it is needed for this CLI command."

rasa/core/actions/loops.py

@@ -11,7 +11,7 @@
     from rasa.shared.core.trackers import DialogueStateTracker
 
 
-class LoopAction(Action, ABC):  # pytype: disable=base-class-error
+class LoopAction(Action, ABC):  # rasa-16-to-rasa-17
     async def run(
         self,
         output_channel: "OutputChannel",
@@ -43,13 +43,14 @@ async def is_activated(
         tracker: "DialogueStateTracker",
         domain: "Domain",
     ) -> bool:
-        # pytype: disable=attribute-error
+        # rasa-16-to-rasa-17
         return tracker.active_loop_name == self.name()
-        # pytype: enable=attribute-error
+
+    # rasa-16-to-rasa-17
 
     # default implementation checks if form active
     def _default_activation_events(self) -> List[Event]:
-        return [ActiveLoop(self.name())]  # pytype: disable=attribute-error
+        return [ActiveLoop(self.name())]  # rasa-16-to-rasa-17
 
     async def activate(
         self,

rasa/core/channels/botframework.py

@@ -152,7 +152,7 @@ async def send_elements(
     async def send_custom_json(
         self, recipient_id: Text, json_message: Dict[Text, Any], **kwargs: Any
     ) -> None:
-        # pytype: disable=attribute-error
+        # rasa-16-to-rasa-17
         json_message.setdefault("type", "message")
         json_message.setdefault("recipient", {}).setdefault("id", recipient_id)
         json_message.setdefault("from", self.bot)
@@ -161,7 +161,9 @@ async def send_custom_json(
         ).setdefault("alert", "true")
         json_message.setdefault("text", "")
         await self.send(json_message)
-        # pytype: enable=attribute-error
+
+
+# rasa-16-to-rasa-17
 
 
 class BotFrameworkInput(InputChannel):
@@ -176,9 +178,10 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
         if not credentials:
             cls.raise_missing_credentials_exception()
 
-        # pytype: disable=attribute-error
+        # rasa-16-to-rasa-17
         return cls(credentials.get("app_id"), credentials.get("app_password"))
-        # pytype: enable=attribute-error
+
+    # rasa-16-to-rasa-17
 
     def __init__(self, app_id: Text, app_password: Text) -> None:
         """Create a Bot Framework input channel.

rasa/core/channels/channel.py

@@ -19,7 +19,7 @@
 from rasa.shared.constants import DOCS_BASE_URL, DEFAULT_SENDER_ID
 
 try:
-    from urlparse import urljoin  # pytype: disable=import-error
+    from urlparse import urljoin  # rasa-16-to-rasa-17
 except ImportError:
     from urllib.parse import urljoin
 
@@ -318,7 +318,7 @@ def latest_output(self) -> Optional[Dict[Text, Any]]:
             return None
 
     async def _persist_message(self, message: Dict[Text, Any]) -> None:
-        self.messages.append(message)  # pytype: disable=bad-return-type
+        self.messages.append(message)  # rasa-16-to-rasa-17
 
     async def send_text_message(
         self, recipient_id: Text, text: Text, **kwargs: Any

rasa/core/channels/facebook.py

@@ -325,13 +325,14 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
         if not credentials:
             cls.raise_missing_credentials_exception()
 
-        # pytype: disable=attribute-error
+        # rasa-16-to-rasa-17
         return cls(
             credentials.get("verify"),
             credentials.get("secret"),
             credentials.get("page-access-token"),
         )
-        # pytype: enable=attribute-error
+
+    # rasa-16-to-rasa-17
 
     def __init__(self, fb_verify: Text, fb_secret: Text, fb_access_token: Text) -> None:
         """Create a facebook input channel.

rasa/core/channels/hangouts.py

@@ -184,7 +184,7 @@ class HangoutsInput(InputChannel):
     def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChannel:
 
         if credentials:
-            return cls(credentials.get("project_id"))  # pytype: disable=attribute-error
+            return cls(credentials.get("project_id"))  # rasa-16-to-rasa-17
 
         return cls()
 

rasa/core/channels/mattermost.py

@@ -132,7 +132,7 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
         if credentials is None:
             cls.raise_missing_credentials_exception()
 
-        # pytype: disable=attribute-error
+        # rasa-16-to-rasa-17
         if credentials.get("pw") is not None or credentials.get("user") is not None:
             rasa.shared.utils.io.raise_deprecation_warning(
                 "Mattermost recently switched to bot accounts. 'user' and 'pw' "
@@ -148,7 +148,8 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
             token = credentials.get("token")
 
         return cls(credentials.get("url"), token, credentials.get("webhook_url"))
-        # pytype: enable=attribute-error
+
+    # rasa-16-to-rasa-17
 
     def __init__(self, url: Text, token: Text, webhook_url: Text) -> None:
         """Create a Mattermost input channel.

rasa/core/channels/rasa_chat.py

@@ -31,7 +31,7 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
         if not credentials:
             cls.raise_missing_credentials_exception()
 
-        return cls(credentials.get("url"))  # pytype: disable=attribute-error
+        return cls(credentials.get("url"))  # rasa-16-to-rasa-17
 
     def __init__(self, url: Optional[Text]) -> None:
         self.base_url = url

rasa/core/channels/rest.py

@@ -46,7 +46,7 @@ async def on_message_wrapper(
         )
         await on_new_message(message)
 
-        await queue.put("DONE")  # pytype: disable=bad-return-type
+        await queue.put("DONE")  # rasa-16-to-rasa-17
 
     async def _extract_sender(self, req: Request) -> Optional[Text]:
         return req.json.get("sender", None)
@@ -73,7 +73,6 @@ async def stream(resp: Any) -> None:
                     on_new_message, text, q, sender_id, input_channel, metadata
                 )
             )
-            result = None  # declare variable up front to avoid pytype error
             while True:
                 result = await q.get()
                 if result == "DONE":
@@ -82,7 +81,7 @@ async def stream(resp: Any) -> None:
                     await resp.write(json.dumps(result) + "\n")
             await task
 
-        return stream  # pytype: disable=bad-return-type
+        return stream  # rasa-16-to-rasa-17
 
     def blueprint(
         self, on_new_message: Callable[[UserMessage], Awaitable[None]]
@@ -159,4 +158,4 @@ def latest_output(self) -> NoReturn:
         raise NotImplementedError("A queue doesn't allow to peek at messages.")
 
     async def _persist_message(self, message) -> None:
-        await self.messages.put(message)  # pytype: disable=bad-return-type
+        await self.messages.put(message)  # rasa-16-to-rasa-17

rasa/core/channels/rocketchat.py

@@ -108,13 +108,14 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
         if not credentials:
             cls.raise_missing_credentials_exception()
 
-        # pytype: disable=attribute-error
+        # rasa-16-to-rasa-17
         return cls(
             credentials.get("user"),
             credentials.get("password"),
             credentials.get("server_url"),
         )
-        # pytype: enable=attribute-error
+
+    # rasa-16-to-rasa-17
 
     def __init__(self, user: Text, password: Text, server_url: Text) -> None:
 

rasa/core/channels/slack.py

@@ -128,7 +128,7 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
         if not credentials:
             cls.raise_missing_credentials_exception()
 
-        # pytype: disable=attribute-error
+        # rasa-16-to-rasa-17
         return cls(
             credentials.get("slack_token"),
             credentials.get("slack_channel"),
@@ -138,7 +138,8 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
             credentials.get("errors_ignore_retry", None),
             credentials.get("use_threads", False),
         )
-        # pytype: enable=attribute-error
+
+    # rasa-16-to-rasa-17
 
     def __init__(
         self,

rasa/core/channels/telegram.py

@@ -148,13 +148,14 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
         if not credentials:
             cls.raise_missing_credentials_exception()
 
-        # pytype: disable=attribute-error
+        # rasa-16-to-rasa-17
         return cls(
             credentials.get("access_token"),
             credentials.get("verify"),
             credentials.get("webhook_url"),
         )
-        # pytype: enable=attribute-error
+
+    # rasa-16-to-rasa-17
 
     def __init__(
         self,

rasa/core/channels/twilio.py

@@ -94,13 +94,14 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
         if not credentials:
             cls.raise_missing_credentials_exception()
 
-        # pytype: disable=attribute-error
+        # rasa-16-to-rasa-17
         return cls(
             credentials.get("account_sid"),
             credentials.get("auth_token"),
             credentials.get("twilio_number"),
         )
-        # pytype: enable=attribute-error
+
+    # rasa-16-to-rasa-17
 
     def __init__(
         self,

rasa/core/channels/webexteams.py

@@ -55,9 +55,10 @@ def from_credentials(cls, credentials: Optional[Dict[Text, Any]]) -> InputChanne
         if not credentials:
             cls.raise_missing_credentials_exception()
 
-        # pytype: disable=attribute-error
+        # rasa-16-to-rasa-17
         return cls(credentials.get("access_token"), credentials.get("room"))
-        # pytype: enable=attribute-error
+
+    # rasa-16-to-rasa-17
 
     def __init__(self, access_token: Text, room: Optional[Text] = None) -> None:
         """Create a Cisco Webex Teams input channel.