2022-01-28 18:59:54 +03:00
|
|
|
from typing import Dict, Any, List, Optional, Tuple, Union, TYPE_CHECKING
|
2017-10-10 03:21:28 +03:00
|
|
|
import functools
|
2019-03-11 14:50:44 +03:00
|
|
|
import copy
|
2018-04-03 16:50:31 +03:00
|
|
|
from ..errors import Errors
|
|
|
|
|
2022-01-28 18:59:54 +03:00
|
|
|
if TYPE_CHECKING:
|
|
|
|
from .doc import Doc
|
|
|
|
from .span import Span
|
|
|
|
from .token import Token
|
|
|
|
|
2017-10-27 15:39:09 +03:00
|
|
|
|
2020-07-12 15:03:23 +03:00
|
|
|
class Underscore:
|
2019-03-11 14:50:44 +03:00
|
|
|
mutable_types = (dict, list, set)
|
🏷 Add Mypy check to CI and ignore all existing Mypy errors (#9167)
* 🚨 Ignore all existing Mypy errors
* 🏗 Add Mypy check to CI
* Add types-mock and types-requests as dev requirements
* Add additional type ignore directives
* Add types packages to dev-only list in reqs test
* Add types-dataclasses for python 3.6
* Add ignore to pretrain
* 🏷 Improve type annotation on `run_command` helper
The `run_command` helper previously declared that it returned an
`Optional[subprocess.CompletedProcess]`, but it isn't actually possible
for the function to return `None`. These changes modify the type
annotation of the `run_command` helper and remove all now-unnecessary
`# type: ignore` directives.
* 🔧 Allow variable type redefinition in limited contexts
These changes modify how Mypy is configured to allow variables to have
their type automatically redefined under certain conditions. The Mypy
documentation contains the following example:
```python
def process(items: List[str]) -> None:
# 'items' has type List[str]
items = [item.split() for item in items]
# 'items' now has type List[List[str]]
...
```
This configuration change is especially helpful in reducing the number
of `# type: ignore` directives needed to handle the common pattern of:
* Accepting a filepath as a string
* Overwriting the variable using `filepath = ensure_path(filepath)`
These changes enable redefinition and remove all `# type: ignore`
directives rendered redundant by this change.
* 🏷 Add type annotation to converters mapping
* 🚨 Fix Mypy error in convert CLI argument verification
* 🏷 Improve type annotation on `resolve_dot_names` helper
* 🏷 Add type annotations for `Vocab` attributes `strings` and `vectors`
* 🏷 Add type annotations for more `Vocab` attributes
* 🏷 Add loose type annotation for gold data compilation
* 🏷 Improve `_format_labels` type annotation
* 🏷 Fix `get_lang_class` type annotation
* 🏷 Loosen return type of `Language.evaluate`
* 🏷 Don't accept `Scorer` in `handle_scores_per_type`
* 🏷 Add `string_to_list` overloads
* 🏷 Fix non-Optional command-line options
* 🙈 Ignore redefinition of `wandb_logger` in `loggers.py`
* ➕ Install `typing_extensions` in Python 3.8+
The `typing_extensions` package states that it should be used when
"writing code that must be compatible with multiple Python versions".
Since SpaCy needs to support multiple Python versions, it should be used
when newer `typing` module members are required. One example of this is
`Literal`, which is available starting with Python 3.8.
Previously SpaCy tried to import `Literal` from `typing`, falling back
to `typing_extensions` if the import failed. However, Mypy doesn't seem
to be able to understand what `Literal` means when the initial import
means. Therefore, these changes modify how `compat` imports `Literal` by
always importing it from `typing_extensions`.
These changes also modify how `typing_extensions` is installed, so that
it is a requirement for all Python versions, including those greater
than or equal to 3.8.
* 🏷 Improve type annotation for `Language.pipe`
These changes add a missing overload variant to the type signature of
`Language.pipe`. Additionally, the type signature is enhanced to allow
type checkers to differentiate between the two overload variants based
on the `as_tuple` parameter.
Fixes #8772
* ➖ Don't install `typing-extensions` in Python 3.8+
After more detailed analysis of how to implement Python version-specific
type annotations using SpaCy, it has been determined that by branching
on a comparison against `sys.version_info` can be statically analyzed by
Mypy well enough to enable us to conditionally use
`typing_extensions.Literal`. This means that we no longer need to
install `typing_extensions` for Python versions greater than or equal to
3.8! 🎉
These changes revert previous changes installing `typing-extensions`
regardless of Python version and modify how we import the `Literal` type
to ensure that Mypy treats it properly.
* resolve mypy errors for Strict pydantic types
* refactor code to avoid missing return statement
* fix types of convert CLI command
* avoid list-set confustion in debug_data
* fix typo and formatting
* small fixes to avoid type ignores
* fix types in profile CLI command and make it more efficient
* type fixes in projects CLI
* put one ignore back
* type fixes for render
* fix render types - the sequel
* fix BaseDefault in language definitions
* fix type of noun_chunks iterator - yields tuple instead of span
* fix types in language-specific modules
* 🏷 Expand accepted inputs of `get_string_id`
`get_string_id` accepts either a string (in which case it returns its
ID) or an ID (in which case it immediately returns the ID). These
changes extend the type annotation of `get_string_id` to indicate that
it can accept either strings or IDs.
* 🏷 Handle override types in `combine_score_weights`
The `combine_score_weights` function allows users to pass an `overrides`
mapping to override data extracted from the `weights` argument. Since it
allows `Optional` dictionary values, the return value may also include
`Optional` dictionary values.
These changes update the type annotations for `combine_score_weights` to
reflect this fact.
* 🏷 Fix tokenizer serialization method signatures in `DummyTokenizer`
* 🏷 Fix redefinition of `wandb_logger`
These changes fix the redefinition of `wandb_logger` by giving a
separate name to each `WandbLogger` version. For
backwards-compatibility, `spacy.train` still exports `wandb_logger_v3`
as `wandb_logger` for now.
* more fixes for typing in language
* type fixes in model definitions
* 🏷 Annotate `_RandomWords.probs` as `NDArray`
* 🏷 Annotate `tok2vec` layers to help Mypy
* 🐛 Fix `_RandomWords.probs` type annotations for Python 3.6
Also remove an import that I forgot to move to the top of the module 😅
* more fixes for matchers and other pipeline components
* quick fix for entity linker
* fixing types for spancat, textcat, etc
* bugfix for tok2vec
* type annotations for scorer
* add runtime_checkable for Protocol
* type and import fixes in tests
* mypy fixes for training utilities
* few fixes in util
* fix import
* 🐵 Remove unused `# type: ignore` directives
* 🏷 Annotate `Language._components`
* 🏷 Annotate `spacy.pipeline.Pipe`
* add doc as property to span.pyi
* small fixes and cleanup
* explicit type annotations instead of via comment
Co-authored-by: Adriane Boyd <adrianeboyd@gmail.com>
Co-authored-by: svlandeg <sofie.vanlandeghem@gmail.com>
Co-authored-by: svlandeg <svlandeg@github.com>
2021-10-14 16:21:40 +03:00
|
|
|
doc_extensions: Dict[Any, Any] = {}
|
|
|
|
span_extensions: Dict[Any, Any] = {}
|
|
|
|
token_extensions: Dict[Any, Any] = {}
|
2022-01-28 18:59:54 +03:00
|
|
|
_extensions: Dict[str, Any]
|
|
|
|
_obj: Union["Doc", "Span", "Token"]
|
|
|
|
_start: Optional[int]
|
|
|
|
_end: Optional[int]
|
2017-10-07 19:00:14 +03:00
|
|
|
|
2022-01-28 18:59:54 +03:00
|
|
|
def __init__(
|
|
|
|
self,
|
|
|
|
extensions: Dict[str, Any],
|
|
|
|
obj: Union["Doc", "Span", "Token"],
|
|
|
|
start: Optional[int] = None,
|
|
|
|
end: Optional[int] = None,
|
|
|
|
):
|
💫 Tidy up and auto-format .py files (#2983)
<!--- Provide a general summary of your changes in the title. -->
## Description
- [x] Use [`black`](https://github.com/ambv/black) to auto-format all `.py` files.
- [x] Update flake8 config to exclude very large files (lemmatization tables etc.)
- [x] Update code to be compatible with flake8 rules
- [x] Fix various small bugs, inconsistencies and messy stuff in the language data
- [x] Update docs to explain new code style (`black`, `flake8`, when to use `# fmt: off` and `# fmt: on` and what `# noqa` means)
Once #2932 is merged, which auto-formats and tidies up the CLI, we'll be able to run `flake8 spacy` actually get meaningful results.
At the moment, the code style and linting isn't applied automatically, but I'm hoping that the new [GitHub Actions](https://github.com/features/actions) will let us auto-format pull requests and post comments with relevant linting information.
### Types of change
enhancement, code style
## Checklist
<!--- Before you submit the PR, go over this checklist and make sure you can
tick off all the boxes. [] -> [x] -->
- [x] I have submitted the spaCy Contributor Agreement.
- [x] I ran the tests, and all new and existing tests passed.
- [x] My changes don't require a change to the documentation, or if they do, I've added all required information.
2018-11-30 19:03:03 +03:00
|
|
|
object.__setattr__(self, "_extensions", extensions)
|
|
|
|
object.__setattr__(self, "_obj", obj)
|
2017-10-07 19:00:14 +03:00
|
|
|
# Assumption is that for doc values, _start and _end will both be None
|
|
|
|
# Span will set non-None values for _start and _end
|
|
|
|
# Token will have _start be non-None, _end be None
|
|
|
|
# This lets us key everything into the doc.user_data dictionary,
|
|
|
|
# (see _get_key), and lets us use a single Underscore class.
|
💫 Tidy up and auto-format .py files (#2983)
<!--- Provide a general summary of your changes in the title. -->
## Description
- [x] Use [`black`](https://github.com/ambv/black) to auto-format all `.py` files.
- [x] Update flake8 config to exclude very large files (lemmatization tables etc.)
- [x] Update code to be compatible with flake8 rules
- [x] Fix various small bugs, inconsistencies and messy stuff in the language data
- [x] Update docs to explain new code style (`black`, `flake8`, when to use `# fmt: off` and `# fmt: on` and what `# noqa` means)
Once #2932 is merged, which auto-formats and tidies up the CLI, we'll be able to run `flake8 spacy` actually get meaningful results.
At the moment, the code style and linting isn't applied automatically, but I'm hoping that the new [GitHub Actions](https://github.com/features/actions) will let us auto-format pull requests and post comments with relevant linting information.
### Types of change
enhancement, code style
## Checklist
<!--- Before you submit the PR, go over this checklist and make sure you can
tick off all the boxes. [] -> [x] -->
- [x] I have submitted the spaCy Contributor Agreement.
- [x] I ran the tests, and all new and existing tests passed.
- [x] My changes don't require a change to the documentation, or if they do, I've added all required information.
2018-11-30 19:03:03 +03:00
|
|
|
object.__setattr__(self, "_doc", obj.doc)
|
|
|
|
object.__setattr__(self, "_start", start)
|
|
|
|
object.__setattr__(self, "_end", end)
|
2017-10-07 19:00:14 +03:00
|
|
|
|
2022-01-28 18:59:54 +03:00
|
|
|
def __dir__(self) -> List[str]:
|
2019-05-12 01:53:11 +03:00
|
|
|
# Hack to enable autocomplete on custom extensions
|
|
|
|
extensions = list(self._extensions.keys())
|
|
|
|
return ["set", "get", "has"] + extensions
|
|
|
|
|
2022-01-28 18:59:54 +03:00
|
|
|
def __getattr__(self, name: str) -> Any:
|
2017-10-07 19:56:01 +03:00
|
|
|
if name not in self._extensions:
|
2018-04-03 16:50:31 +03:00
|
|
|
raise AttributeError(Errors.E046.format(name=name))
|
2017-10-07 19:56:01 +03:00
|
|
|
default, method, getter, setter = self._extensions[name]
|
2017-10-07 19:00:14 +03:00
|
|
|
if getter is not None:
|
|
|
|
return getter(self._obj)
|
|
|
|
elif method is not None:
|
2019-05-12 01:53:11 +03:00
|
|
|
method_partial = functools.partial(method, self._obj)
|
|
|
|
# Hack to port over docstrings of the original function
|
|
|
|
# See https://stackoverflow.com/q/27362727/6400719
|
|
|
|
method_docstring = method.__doc__ or ""
|
|
|
|
method_docstring_prefix = (
|
|
|
|
"This method is a partial function and its first argument "
|
|
|
|
"(the object it's called on) will be filled automatically. "
|
|
|
|
)
|
|
|
|
method_partial.__doc__ = method_docstring_prefix + method_docstring
|
|
|
|
return method_partial
|
2017-10-07 19:00:14 +03:00
|
|
|
else:
|
2019-03-11 14:50:44 +03:00
|
|
|
key = self._get_key(name)
|
|
|
|
if key in self._doc.user_data:
|
|
|
|
return self._doc.user_data[key]
|
|
|
|
elif isinstance(default, self.mutable_types):
|
|
|
|
# Handle mutable default arguments (see #2581)
|
|
|
|
new_default = copy.copy(default)
|
|
|
|
self.__setattr__(name, new_default)
|
|
|
|
return new_default
|
|
|
|
return default
|
2017-10-07 19:00:14 +03:00
|
|
|
|
2022-01-28 18:59:54 +03:00
|
|
|
def __setattr__(self, name: str, value: Any):
|
2017-10-07 19:56:01 +03:00
|
|
|
if name not in self._extensions:
|
2018-04-03 16:50:31 +03:00
|
|
|
raise AttributeError(Errors.E047.format(name=name))
|
2017-10-07 19:56:01 +03:00
|
|
|
default, method, getter, setter = self._extensions[name]
|
2017-10-07 19:00:14 +03:00
|
|
|
if setter is not None:
|
|
|
|
return setter(self._obj, value)
|
|
|
|
else:
|
|
|
|
self._doc.user_data[self._get_key(name)] = value
|
|
|
|
|
2022-01-28 18:59:54 +03:00
|
|
|
def set(self, name: str, value: Any):
|
2017-10-10 05:14:35 +03:00
|
|
|
return self.__setattr__(name, value)
|
|
|
|
|
2022-01-28 18:59:54 +03:00
|
|
|
def get(self, name: str) -> Any:
|
2017-10-10 05:14:35 +03:00
|
|
|
return self.__getattr__(name)
|
|
|
|
|
2022-01-28 18:59:54 +03:00
|
|
|
def has(self, name: str) -> bool:
|
2017-10-10 05:14:35 +03:00
|
|
|
return name in self._extensions
|
|
|
|
|
2022-01-28 18:59:54 +03:00
|
|
|
def _get_key(self, name: str) -> Tuple[str, str, Optional[int], Optional[int]]:
|
💫 Tidy up and auto-format .py files (#2983)
<!--- Provide a general summary of your changes in the title. -->
## Description
- [x] Use [`black`](https://github.com/ambv/black) to auto-format all `.py` files.
- [x] Update flake8 config to exclude very large files (lemmatization tables etc.)
- [x] Update code to be compatible with flake8 rules
- [x] Fix various small bugs, inconsistencies and messy stuff in the language data
- [x] Update docs to explain new code style (`black`, `flake8`, when to use `# fmt: off` and `# fmt: on` and what `# noqa` means)
Once #2932 is merged, which auto-formats and tidies up the CLI, we'll be able to run `flake8 spacy` actually get meaningful results.
At the moment, the code style and linting isn't applied automatically, but I'm hoping that the new [GitHub Actions](https://github.com/features/actions) will let us auto-format pull requests and post comments with relevant linting information.
### Types of change
enhancement, code style
## Checklist
<!--- Before you submit the PR, go over this checklist and make sure you can
tick off all the boxes. [] -> [x] -->
- [x] I have submitted the spaCy Contributor Agreement.
- [x] I ran the tests, and all new and existing tests passed.
- [x] My changes don't require a change to the documentation, or if they do, I've added all required information.
2018-11-30 19:03:03 +03:00
|
|
|
return ("._.", name, self._start, self._end)
|
2018-04-03 19:30:17 +03:00
|
|
|
|
2020-02-12 13:50:42 +03:00
|
|
|
@classmethod
|
2022-01-28 18:59:54 +03:00
|
|
|
def get_state(cls) -> Tuple[Dict[Any, Any], Dict[Any, Any], Dict[Any, Any]]:
|
2020-02-12 13:50:42 +03:00
|
|
|
return cls.token_extensions, cls.span_extensions, cls.doc_extensions
|
|
|
|
|
|
|
|
@classmethod
|
2022-01-28 18:59:54 +03:00
|
|
|
def load_state(
|
|
|
|
cls, state: Tuple[Dict[Any, Any], Dict[Any, Any], Dict[Any, Any]]
|
|
|
|
) -> None:
|
2020-02-12 13:50:42 +03:00
|
|
|
cls.token_extensions, cls.span_extensions, cls.doc_extensions = state
|
|
|
|
|
2018-04-03 19:30:17 +03:00
|
|
|
|
2022-01-28 18:59:54 +03:00
|
|
|
def get_ext_args(**kwargs: Any):
|
2018-04-03 19:30:17 +03:00
|
|
|
"""Validate and convert arguments. Reused in Doc, Token and Span."""
|
💫 Tidy up and auto-format .py files (#2983)
<!--- Provide a general summary of your changes in the title. -->
## Description
- [x] Use [`black`](https://github.com/ambv/black) to auto-format all `.py` files.
- [x] Update flake8 config to exclude very large files (lemmatization tables etc.)
- [x] Update code to be compatible with flake8 rules
- [x] Fix various small bugs, inconsistencies and messy stuff in the language data
- [x] Update docs to explain new code style (`black`, `flake8`, when to use `# fmt: off` and `# fmt: on` and what `# noqa` means)
Once #2932 is merged, which auto-formats and tidies up the CLI, we'll be able to run `flake8 spacy` actually get meaningful results.
At the moment, the code style and linting isn't applied automatically, but I'm hoping that the new [GitHub Actions](https://github.com/features/actions) will let us auto-format pull requests and post comments with relevant linting information.
### Types of change
enhancement, code style
## Checklist
<!--- Before you submit the PR, go over this checklist and make sure you can
tick off all the boxes. [] -> [x] -->
- [x] I have submitted the spaCy Contributor Agreement.
- [x] I ran the tests, and all new and existing tests passed.
- [x] My changes don't require a change to the documentation, or if they do, I've added all required information.
2018-11-30 19:03:03 +03:00
|
|
|
default = kwargs.get("default")
|
|
|
|
getter = kwargs.get("getter")
|
|
|
|
setter = kwargs.get("setter")
|
|
|
|
method = kwargs.get("method")
|
2018-04-03 19:30:17 +03:00
|
|
|
if getter is None and setter is not None:
|
|
|
|
raise ValueError(Errors.E089)
|
💫 Tidy up and auto-format .py files (#2983)
<!--- Provide a general summary of your changes in the title. -->
## Description
- [x] Use [`black`](https://github.com/ambv/black) to auto-format all `.py` files.
- [x] Update flake8 config to exclude very large files (lemmatization tables etc.)
- [x] Update code to be compatible with flake8 rules
- [x] Fix various small bugs, inconsistencies and messy stuff in the language data
- [x] Update docs to explain new code style (`black`, `flake8`, when to use `# fmt: off` and `# fmt: on` and what `# noqa` means)
Once #2932 is merged, which auto-formats and tidies up the CLI, we'll be able to run `flake8 spacy` actually get meaningful results.
At the moment, the code style and linting isn't applied automatically, but I'm hoping that the new [GitHub Actions](https://github.com/features/actions) will let us auto-format pull requests and post comments with relevant linting information.
### Types of change
enhancement, code style
## Checklist
<!--- Before you submit the PR, go over this checklist and make sure you can
tick off all the boxes. [] -> [x] -->
- [x] I have submitted the spaCy Contributor Agreement.
- [x] I ran the tests, and all new and existing tests passed.
- [x] My changes don't require a change to the documentation, or if they do, I've added all required information.
2018-11-30 19:03:03 +03:00
|
|
|
valid_opts = ("default" in kwargs, method is not None, getter is not None)
|
2018-04-03 19:30:17 +03:00
|
|
|
nr_defined = sum(t is True for t in valid_opts)
|
|
|
|
if nr_defined != 1:
|
|
|
|
raise ValueError(Errors.E083.format(nr_defined=nr_defined))
|
💫 Tidy up and auto-format .py files (#2983)
<!--- Provide a general summary of your changes in the title. -->
## Description
- [x] Use [`black`](https://github.com/ambv/black) to auto-format all `.py` files.
- [x] Update flake8 config to exclude very large files (lemmatization tables etc.)
- [x] Update code to be compatible with flake8 rules
- [x] Fix various small bugs, inconsistencies and messy stuff in the language data
- [x] Update docs to explain new code style (`black`, `flake8`, when to use `# fmt: off` and `# fmt: on` and what `# noqa` means)
Once #2932 is merged, which auto-formats and tidies up the CLI, we'll be able to run `flake8 spacy` actually get meaningful results.
At the moment, the code style and linting isn't applied automatically, but I'm hoping that the new [GitHub Actions](https://github.com/features/actions) will let us auto-format pull requests and post comments with relevant linting information.
### Types of change
enhancement, code style
## Checklist
<!--- Before you submit the PR, go over this checklist and make sure you can
tick off all the boxes. [] -> [x] -->
- [x] I have submitted the spaCy Contributor Agreement.
- [x] I ran the tests, and all new and existing tests passed.
- [x] My changes don't require a change to the documentation, or if they do, I've added all required information.
2018-11-30 19:03:03 +03:00
|
|
|
if setter is not None and not hasattr(setter, "__call__"):
|
|
|
|
raise ValueError(Errors.E091.format(name="setter", value=repr(setter)))
|
|
|
|
if getter is not None and not hasattr(getter, "__call__"):
|
|
|
|
raise ValueError(Errors.E091.format(name="getter", value=repr(getter)))
|
|
|
|
if method is not None and not hasattr(method, "__call__"):
|
|
|
|
raise ValueError(Errors.E091.format(name="method", value=repr(method)))
|
2018-04-03 19:30:17 +03:00
|
|
|
return (default, method, getter, setter)
|
2019-02-24 20:38:47 +03:00
|
|
|
|
|
|
|
|
|
|
|
def is_writable_attr(ext):
|
|
|
|
"""Check if an extension attribute is writable.
|
|
|
|
ext (tuple): The (default, getter, setter, method) tuple available via
|
|
|
|
{Doc,Span,Token}.get_extension.
|
|
|
|
RETURNS (bool): Whether the attribute is writable.
|
|
|
|
"""
|
|
|
|
default, method, getter, setter = ext
|
|
|
|
# Extension is writable if it has a setter (getter + setter), if it has a
|
|
|
|
# default value (or, if its default value is none, none of the other values
|
|
|
|
# should be set).
|
|
|
|
if setter is not None or default is not None or all(e is None for e in ext):
|
|
|
|
return True
|
|
|
|
return False
|