🏷 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 13:21:40 +00:00
|
|
|
from typing import List, Dict, Set, Iterable, Iterator, Union, Optional
|
2020-08-07 12:30:59 +00:00
|
|
|
from pathlib import Path
|
2018-08-22 11:12:51 +00:00
|
|
|
import numpy
|
🏷 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 13:21:40 +00:00
|
|
|
from numpy import ndarray
|
2019-10-03 12:48:45 +00:00
|
|
|
import zlib
|
💫 Replace ujson, msgpack and dill/pickle/cloudpickle with srsly (#3003)
Remove hacks and wrappers, keep code in sync across our libraries and move spaCy a few steps closer to only depending on packages with binary wheels 🎉
See here: https://github.com/explosion/srsly
Serialization is hard, especially across Python versions and multiple platforms. After dealing with many subtle bugs over the years (encodings, locales, large files) our libraries like spaCy and Prodigy have steadily grown a number of utility functions to wrap the multiple serialization formats we need to support (especially json, msgpack and pickle). These wrapping functions ended up duplicated across our codebases, so we wanted to put them in one place.
At the same time, we noticed that having a lot of small dependencies was making maintainence harder, and making installation slower. To solve this, we've made srsly standalone, by including the component packages directly within it. This way we can provide all the serialization utilities we need in a single binary wheel.
srsly currently includes forks of the following packages:
ujson
msgpack
msgpack-numpy
cloudpickle
* WIP: replace json/ujson with srsly
* Replace ujson in examples
Use regular json instead of srsly to make code easier to read and follow
* Update requirements
* Fix imports
* Fix typos
* Replace msgpack with srsly
* Fix warning
2018-12-03 00:28:22 +00:00
|
|
|
import srsly
|
2020-02-18 14:38:18 +00:00
|
|
|
from thinc.api import NumpyOps
|
2018-08-22 11:12:51 +00:00
|
|
|
|
2020-07-29 09:36:42 +00:00
|
|
|
from .doc import Doc
|
|
|
|
from ..vocab import Vocab
|
2018-09-28 13:23:14 +00:00
|
|
|
from ..compat import copy_reg
|
2021-09-27 18:43:03 +00:00
|
|
|
from ..attrs import SPACY, ORTH, intify_attr, IDS
|
2019-09-18 18:23:21 +00:00
|
|
|
from ..errors import Errors
|
2020-08-29 13:20:11 +00:00
|
|
|
from ..util import ensure_path, SimpleFrozenList
|
2018-08-22 11:12:51 +00:00
|
|
|
|
2020-07-04 14:25:34 +00:00
|
|
|
# fmt: off
|
2020-09-16 22:14:01 +00:00
|
|
|
ALL_ATTRS = ("ORTH", "NORM", "TAG", "HEAD", "DEP", "ENT_IOB", "ENT_TYPE", "ENT_KB_ID", "ENT_ID", "LEMMA", "MORPH", "POS", "SENT_START")
|
2020-07-04 14:25:34 +00:00
|
|
|
# fmt: on
|
2020-06-26 17:34:12 +00:00
|
|
|
|
|
|
|
|
2020-07-12 12:03:23 +00:00
|
|
|
class DocBin:
|
2019-09-18 13:15:37 +00:00
|
|
|
"""Pack Doc objects for binary serialization.
|
2019-09-18 17:18:30 +00:00
|
|
|
|
2019-09-18 13:15:37 +00:00
|
|
|
The DocBin class lets you efficiently serialize the information from a
|
2019-09-18 11:25:47 +00:00
|
|
|
collection of Doc objects. You can control which information is serialized
|
|
|
|
by passing a list of attribute IDs, and optionally also specify whether the
|
2019-09-18 13:15:37 +00:00
|
|
|
user data is serialized. The DocBin is faster and produces smaller data
|
2019-09-18 11:25:47 +00:00
|
|
|
sizes than pickle, and allows you to deserialize without executing arbitrary
|
|
|
|
Python code.
|
💫 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 16:03:03 +00:00
|
|
|
|
2019-09-18 11:25:47 +00:00
|
|
|
The serialization format is gzipped msgpack, where the msgpack object has
|
|
|
|
the following structure:
|
2019-09-18 17:18:30 +00:00
|
|
|
|
2019-09-18 11:25:47 +00:00
|
|
|
{
|
|
|
|
"attrs": List[uint64], # e.g. [TAG, HEAD, ENT_IOB, ENT_TYPE]
|
|
|
|
"tokens": bytes, # Serialized numpy uint64 array with the token data
|
2021-01-14 06:30:41 +00:00
|
|
|
"spans": List[Dict[str, bytes]], # SpanGroups data for each doc
|
2019-09-18 11:25:47 +00:00
|
|
|
"spaces": bytes, # Serialized numpy boolean array with spaces data
|
|
|
|
"lengths": bytes, # Serialized numpy int32 array with the doc lengths
|
2021-09-13 15:02:17 +00:00
|
|
|
"strings": List[str] # List of unique strings in the token data
|
2020-07-02 15:41:50 +00:00
|
|
|
"version": str, # DocBin version number
|
2019-09-18 11:25:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Strings for the words, tags, labels etc are represented by 64-bit hashes in
|
|
|
|
the token data, and every string that occurs at least once is passed via the
|
|
|
|
strings object. This means the storage is more efficient if you pack more
|
|
|
|
documents together, because you have less duplication in the strings.
|
|
|
|
|
|
|
|
A notable downside to this format is that you can't easily extract just one
|
2019-09-18 18:23:21 +00:00
|
|
|
document from the DocBin.
|
2019-09-18 11:25:47 +00:00
|
|
|
"""
|
2019-09-18 17:18:30 +00:00
|
|
|
|
2020-07-29 09:36:42 +00:00
|
|
|
def __init__(
|
|
|
|
self,
|
|
|
|
attrs: Iterable[str] = ALL_ATTRS,
|
|
|
|
store_user_data: bool = False,
|
2020-08-29 13:20:11 +00:00
|
|
|
docs: Iterable[Doc] = SimpleFrozenList(),
|
2020-07-29 09:36:42 +00:00
|
|
|
) -> None:
|
2019-09-18 18:23:21 +00:00
|
|
|
"""Create a DocBin object to hold serialized annotations.
|
💫 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 16:03:03 +00:00
|
|
|
|
2020-07-29 09:36:42 +00:00
|
|
|
attrs (Iterable[str]): List of attributes to serialize. 'orth' and
|
|
|
|
'spacy' are always serialized, so they're not required.
|
2020-10-02 13:43:32 +00:00
|
|
|
store_user_data (bool): Whether to write the `Doc.user_data` to bytes/file.
|
2020-07-29 09:36:42 +00:00
|
|
|
docs (Iterable[Doc]): Docs to add.
|
2019-09-18 18:23:21 +00:00
|
|
|
|
2021-01-30 09:09:38 +00:00
|
|
|
DOCS: https://spacy.io/api/docbin#init
|
💫 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 16:03:03 +00:00
|
|
|
"""
|
2021-09-27 18:43:03 +00:00
|
|
|
int_attrs = [intify_attr(attr) for attr in attrs]
|
|
|
|
if None in int_attrs:
|
|
|
|
non_valid = [attr for attr in attrs if intify_attr(attr) is None]
|
2021-10-01 09:17:11 +00:00
|
|
|
raise KeyError(
|
|
|
|
Errors.E983.format(dict="attrs", key=non_valid, keys=IDS.keys())
|
|
|
|
) from None
|
2021-09-27 18:43:03 +00:00
|
|
|
attrs = sorted(int_attrs)
|
2020-07-02 15:41:50 +00:00
|
|
|
self.version = "0.1"
|
2019-07-10 17:37:20 +00:00
|
|
|
self.attrs = [attr for attr in attrs if attr != ORTH and attr != SPACY]
|
2019-09-18 18:23:21 +00:00
|
|
|
self.attrs.insert(0, ORTH) # Ensure ORTH is always attrs[0]
|
🏷 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 13:21:40 +00:00
|
|
|
self.tokens: List[ndarray] = []
|
|
|
|
self.spaces: List[ndarray] = []
|
|
|
|
self.cats: List[Dict] = []
|
|
|
|
self.span_groups: List[bytes] = []
|
|
|
|
self.user_data: List[Optional[bytes]] = []
|
|
|
|
self.flags: List[Dict] = []
|
|
|
|
self.strings: Set[str] = set()
|
2019-07-10 17:37:20 +00:00
|
|
|
self.store_user_data = store_user_data
|
2020-06-26 17:34:12 +00:00
|
|
|
for doc in docs:
|
|
|
|
self.add(doc)
|
2018-08-22 11:12:51 +00:00
|
|
|
|
2020-07-29 09:36:42 +00:00
|
|
|
def __len__(self) -> int:
|
2019-09-18 18:23:21 +00:00
|
|
|
"""RETURNS: The number of Doc objects added to the DocBin."""
|
|
|
|
return len(self.tokens)
|
|
|
|
|
2020-07-29 09:36:42 +00:00
|
|
|
def add(self, doc: Doc) -> None:
|
2019-09-18 18:23:21 +00:00
|
|
|
"""Add a Doc's annotations to the DocBin for serialization.
|
|
|
|
|
|
|
|
doc (Doc): The Doc object to add.
|
|
|
|
|
2021-01-30 09:09:38 +00:00
|
|
|
DOCS: https://spacy.io/api/docbin#add
|
2019-09-18 18:23:21 +00:00
|
|
|
"""
|
2018-08-22 11:12:51 +00:00
|
|
|
array = doc.to_array(self.attrs)
|
|
|
|
if len(array.shape) == 1:
|
|
|
|
array = array.reshape((array.shape[0], 1))
|
|
|
|
self.tokens.append(array)
|
|
|
|
spaces = doc.to_array(SPACY)
|
2019-09-18 18:23:21 +00:00
|
|
|
assert array.shape[0] == spaces.shape[0] # this should never happen
|
2018-08-22 11:12:51 +00:00
|
|
|
spaces = spaces.reshape((spaces.shape[0], 1))
|
|
|
|
self.spaces.append(numpy.asarray(spaces, dtype=bool))
|
2020-07-04 14:25:34 +00:00
|
|
|
self.flags.append({"has_unknown_spaces": doc.has_unknown_spaces})
|
2020-06-26 17:34:12 +00:00
|
|
|
for token in doc:
|
|
|
|
self.strings.add(token.text)
|
|
|
|
self.strings.add(token.tag_)
|
|
|
|
self.strings.add(token.lemma_)
|
2021-05-17 08:06:11 +00:00
|
|
|
self.strings.add(token.norm_)
|
2020-10-01 20:21:46 +00:00
|
|
|
self.strings.add(str(token.morph))
|
2020-06-26 17:34:12 +00:00
|
|
|
self.strings.add(token.dep_)
|
|
|
|
self.strings.add(token.ent_type_)
|
2020-07-02 15:41:50 +00:00
|
|
|
self.strings.add(token.ent_kb_id_)
|
2021-05-17 08:06:11 +00:00
|
|
|
self.strings.add(token.ent_id_)
|
2019-12-06 13:07:39 +00:00
|
|
|
self.cats.append(doc.cats)
|
2021-10-01 10:37:39 +00:00
|
|
|
if self.store_user_data:
|
|
|
|
self.user_data.append(srsly.msgpack_dumps(doc.user_data))
|
2021-01-14 06:30:41 +00:00
|
|
|
self.span_groups.append(doc.spans.to_bytes())
|
|
|
|
for key, group in doc.spans.items():
|
|
|
|
for span in group:
|
|
|
|
self.strings.add(span.label_)
|
2018-08-22 11:12:51 +00:00
|
|
|
|
2020-07-29 09:36:42 +00:00
|
|
|
def get_docs(self, vocab: Vocab) -> Iterator[Doc]:
|
2019-09-18 18:23:21 +00:00
|
|
|
"""Recover Doc objects from the annotations, using the given vocab.
|
2020-10-02 13:43:32 +00:00
|
|
|
Note that the user data of each doc will be read (if available) and returned,
|
|
|
|
regardless of the setting of 'self.store_user_data'.
|
2019-09-18 18:23:21 +00:00
|
|
|
|
|
|
|
vocab (Vocab): The shared vocab.
|
|
|
|
YIELDS (Doc): The Doc objects.
|
|
|
|
|
2021-01-30 09:09:38 +00:00
|
|
|
DOCS: https://spacy.io/api/docbin#get_docs
|
2019-09-18 18:23:21 +00:00
|
|
|
"""
|
2018-08-22 11:12:51 +00:00
|
|
|
for string in self.strings:
|
|
|
|
vocab[string]
|
|
|
|
orth_col = self.attrs.index(ORTH)
|
2019-07-10 17:37:20 +00:00
|
|
|
for i in range(len(self.tokens)):
|
2020-07-03 10:58:16 +00:00
|
|
|
flags = self.flags[i]
|
2019-07-10 17:37:20 +00:00
|
|
|
tokens = self.tokens[i]
|
🏷 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 13:21:40 +00:00
|
|
|
spaces: Optional[ndarray] = self.spaces[i]
|
2020-07-03 10:58:16 +00:00
|
|
|
if flags.get("has_unknown_spaces"):
|
|
|
|
spaces = None
|
🏷 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 13:21:40 +00:00
|
|
|
doc = Doc(vocab, words=tokens[:, orth_col], spaces=spaces) # type: ignore
|
|
|
|
doc = doc.from_array(self.attrs, tokens) # type: ignore
|
2019-12-06 13:07:39 +00:00
|
|
|
doc.cats = self.cats[i]
|
2021-01-14 06:30:41 +00:00
|
|
|
if self.span_groups[i]:
|
|
|
|
doc.spans.from_bytes(self.span_groups[i])
|
|
|
|
else:
|
|
|
|
doc.spans.clear()
|
2020-10-02 13:43:32 +00:00
|
|
|
if i < len(self.user_data) and self.user_data[i] is not None:
|
2019-10-28 15:02:13 +00:00
|
|
|
user_data = srsly.msgpack_loads(self.user_data[i], use_list=False)
|
|
|
|
doc.user_data.update(user_data)
|
2018-08-22 11:12:51 +00:00
|
|
|
yield doc
|
|
|
|
|
2020-07-29 09:36:42 +00:00
|
|
|
def merge(self, other: "DocBin") -> None:
|
2019-09-18 18:23:21 +00:00
|
|
|
"""Extend the annotations of this DocBin with the annotations from
|
|
|
|
another. Will raise an error if the pre-defined attrs of the two
|
2020-10-02 13:43:32 +00:00
|
|
|
DocBins don't match, or if they differ in whether or not to store
|
|
|
|
user data.
|
2019-09-18 18:23:21 +00:00
|
|
|
|
|
|
|
other (DocBin): The DocBin to merge into the current bin.
|
|
|
|
|
2021-01-30 09:09:38 +00:00
|
|
|
DOCS: https://spacy.io/api/docbin#merge
|
2019-09-18 18:23:21 +00:00
|
|
|
"""
|
|
|
|
if self.attrs != other.attrs:
|
2020-10-02 13:43:32 +00:00
|
|
|
raise ValueError(
|
|
|
|
Errors.E166.format(param="attrs", current=self.attrs, other=other.attrs)
|
|
|
|
)
|
|
|
|
if self.store_user_data != other.store_user_data:
|
|
|
|
raise ValueError(
|
|
|
|
Errors.E166.format(
|
|
|
|
param="store_user_data",
|
|
|
|
current=self.store_user_data,
|
|
|
|
other=other.store_user_data,
|
|
|
|
)
|
|
|
|
)
|
2018-08-22 11:12:51 +00:00
|
|
|
self.tokens.extend(other.tokens)
|
|
|
|
self.spaces.extend(other.spaces)
|
|
|
|
self.strings.update(other.strings)
|
2019-12-06 13:07:39 +00:00
|
|
|
self.cats.extend(other.cats)
|
2021-01-14 06:30:41 +00:00
|
|
|
self.span_groups.extend(other.span_groups)
|
2020-07-03 10:58:16 +00:00
|
|
|
self.flags.extend(other.flags)
|
2020-10-02 13:43:32 +00:00
|
|
|
self.user_data.extend(other.user_data)
|
2018-08-22 11:12:51 +00:00
|
|
|
|
2020-07-29 09:36:42 +00:00
|
|
|
def to_bytes(self) -> bytes:
|
2019-09-18 18:23:21 +00:00
|
|
|
"""Serialize the DocBin's annotations to a bytestring.
|
|
|
|
|
|
|
|
RETURNS (bytes): The serialized DocBin.
|
|
|
|
|
2021-01-30 09:09:38 +00:00
|
|
|
DOCS: https://spacy.io/api/docbin#to_bytes
|
2019-09-18 18:23:21 +00:00
|
|
|
"""
|
2018-08-22 11:12:51 +00:00
|
|
|
for tokens in self.tokens:
|
2019-09-18 18:23:21 +00:00
|
|
|
assert len(tokens.shape) == 2, tokens.shape # this should never happen
|
2018-08-22 11:12:51 +00:00
|
|
|
lengths = [len(tokens) for tokens in self.tokens]
|
2020-03-13 15:07:56 +00:00
|
|
|
tokens = numpy.vstack(self.tokens) if self.tokens else numpy.asarray([])
|
|
|
|
spaces = numpy.vstack(self.spaces) if self.spaces else numpy.asarray([])
|
2018-08-22 11:12:51 +00:00
|
|
|
msg = {
|
2020-07-02 15:41:50 +00:00
|
|
|
"version": self.version,
|
💫 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 16:03:03 +00:00
|
|
|
"attrs": self.attrs,
|
2020-03-13 15:07:56 +00:00
|
|
|
"tokens": tokens.tobytes("C"),
|
|
|
|
"spaces": spaces.tobytes("C"),
|
💫 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 16:03:03 +00:00
|
|
|
"lengths": numpy.asarray(lengths, dtype="int32").tobytes("C"),
|
2020-09-25 20:20:44 +00:00
|
|
|
"strings": list(sorted(self.strings)),
|
2019-12-06 13:07:39 +00:00
|
|
|
"cats": self.cats,
|
2020-07-03 10:58:16 +00:00
|
|
|
"flags": self.flags,
|
2021-01-14 06:30:41 +00:00
|
|
|
"span_groups": self.span_groups,
|
2018-08-22 11:12:51 +00:00
|
|
|
}
|
2019-07-10 17:37:20 +00:00
|
|
|
if self.store_user_data:
|
|
|
|
msg["user_data"] = self.user_data
|
2019-10-03 12:48:45 +00:00
|
|
|
return zlib.compress(srsly.msgpack_dumps(msg))
|
2018-08-22 11:12:51 +00:00
|
|
|
|
2020-07-29 09:36:42 +00:00
|
|
|
def from_bytes(self, bytes_data: bytes) -> "DocBin":
|
2019-09-18 18:23:21 +00:00
|
|
|
"""Deserialize the DocBin's annotations from a bytestring.
|
|
|
|
|
|
|
|
bytes_data (bytes): The data to load from.
|
|
|
|
RETURNS (DocBin): The loaded DocBin.
|
|
|
|
|
2021-01-30 09:09:38 +00:00
|
|
|
DOCS: https://spacy.io/api/docbin#from_bytes
|
2019-09-18 18:23:21 +00:00
|
|
|
"""
|
2020-11-27 06:39:49 +00:00
|
|
|
try:
|
|
|
|
msg = srsly.msgpack_loads(zlib.decompress(bytes_data))
|
|
|
|
except zlib.error:
|
|
|
|
raise ValueError(Errors.E1014)
|
💫 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 16:03:03 +00:00
|
|
|
self.attrs = msg["attrs"]
|
|
|
|
self.strings = set(msg["strings"])
|
2019-10-24 14:18:41 +00:00
|
|
|
lengths = numpy.frombuffer(msg["lengths"], dtype="int32")
|
|
|
|
flat_spaces = numpy.frombuffer(msg["spaces"], dtype=bool)
|
|
|
|
flat_tokens = numpy.frombuffer(msg["tokens"], dtype="uint64")
|
2018-08-22 11:12:51 +00:00
|
|
|
shape = (flat_tokens.size // len(self.attrs), len(self.attrs))
|
|
|
|
flat_tokens = flat_tokens.reshape(shape)
|
|
|
|
flat_spaces = flat_spaces.reshape((flat_spaces.size, 1))
|
|
|
|
self.tokens = NumpyOps().unflatten(flat_tokens, lengths)
|
|
|
|
self.spaces = NumpyOps().unflatten(flat_spaces, lengths)
|
2019-12-06 13:07:39 +00:00
|
|
|
self.cats = msg["cats"]
|
2021-01-14 06:30:41 +00:00
|
|
|
self.span_groups = msg.get("span_groups", [b"" for _ in lengths])
|
2020-07-03 10:58:16 +00:00
|
|
|
self.flags = msg.get("flags", [{} for _ in lengths])
|
2020-10-02 13:43:32 +00:00
|
|
|
if "user_data" in msg:
|
2019-07-10 17:37:20 +00:00
|
|
|
self.user_data = list(msg["user_data"])
|
2020-10-02 13:43:32 +00:00
|
|
|
else:
|
|
|
|
self.user_data = [None] * len(self)
|
2018-08-22 11:12:51 +00:00
|
|
|
for tokens in self.tokens:
|
2019-09-18 18:23:21 +00:00
|
|
|
assert len(tokens.shape) == 2, tokens.shape # this should never happen
|
2018-08-22 11:12:51 +00:00
|
|
|
return self
|
|
|
|
|
2020-08-07 12:30:59 +00:00
|
|
|
def to_disk(self, path: Union[str, Path]) -> None:
|
|
|
|
"""Save the DocBin to a file (typically called .spacy).
|
|
|
|
|
|
|
|
path (str / Path): The file path.
|
|
|
|
|
2021-01-30 09:09:38 +00:00
|
|
|
DOCS: https://spacy.io/api/docbin#to_disk
|
2020-08-07 12:30:59 +00:00
|
|
|
"""
|
|
|
|
path = ensure_path(path)
|
|
|
|
with path.open("wb") as file_:
|
2021-05-17 13:48:40 +00:00
|
|
|
try:
|
|
|
|
file_.write(self.to_bytes())
|
|
|
|
except ValueError:
|
|
|
|
raise ValueError(Errors.E870)
|
2020-08-07 12:30:59 +00:00
|
|
|
|
|
|
|
def from_disk(self, path: Union[str, Path]) -> "DocBin":
|
|
|
|
"""Load the DocBin from a file (typically called .spacy).
|
|
|
|
|
|
|
|
path (str / Path): The file path.
|
|
|
|
RETURNS (DocBin): The loaded DocBin.
|
|
|
|
|
2021-01-30 09:09:38 +00:00
|
|
|
DOCS: https://spacy.io/api/docbin#to_disk
|
2020-08-07 12:30:59 +00:00
|
|
|
"""
|
|
|
|
path = ensure_path(path)
|
|
|
|
with path.open("rb") as file_:
|
|
|
|
self.from_bytes(file_.read())
|
|
|
|
return self
|
|
|
|
|
2018-08-22 11:12:51 +00:00
|
|
|
|
2019-09-18 13:15:37 +00:00
|
|
|
def merge_bins(bins):
|
2019-07-10 17:37:20 +00:00
|
|
|
merged = None
|
2019-09-18 13:15:37 +00:00
|
|
|
for byte_string in bins:
|
2019-07-10 17:37:20 +00:00
|
|
|
if byte_string is not None:
|
2019-09-18 13:15:37 +00:00
|
|
|
doc_bin = DocBin(store_user_data=True).from_bytes(byte_string)
|
2019-07-10 17:37:20 +00:00
|
|
|
if merged is None:
|
2019-09-18 13:15:37 +00:00
|
|
|
merged = doc_bin
|
2019-07-10 17:37:20 +00:00
|
|
|
else:
|
2019-09-18 13:15:37 +00:00
|
|
|
merged.merge(doc_bin)
|
2019-07-10 17:37:20 +00:00
|
|
|
if merged is not None:
|
|
|
|
return merged.to_bytes()
|
|
|
|
else:
|
2019-07-11 09:49:36 +00:00
|
|
|
return b""
|
2018-08-22 11:12:51 +00:00
|
|
|
|
|
|
|
|
2019-09-18 17:18:30 +00:00
|
|
|
def pickle_bin(doc_bin):
|
|
|
|
return (unpickle_bin, (doc_bin.to_bytes(),))
|
2018-08-22 11:12:51 +00:00
|
|
|
|
|
|
|
|
2019-09-18 13:15:37 +00:00
|
|
|
def unpickle_bin(byte_string):
|
|
|
|
return DocBin().from_bytes(byte_string)
|
2018-08-22 11:12:51 +00:00
|
|
|
|
|
|
|
|
2019-09-18 13:15:37 +00:00
|
|
|
copy_reg.pickle(DocBin, pickle_bin, unpickle_bin)
|
2019-07-10 17:37:20 +00:00
|
|
|
# Compatibility, as we had named it this previously.
|
2019-09-18 13:15:37 +00:00
|
|
|
Binder = DocBin
|
2019-07-10 17:37:20 +00:00
|
|
|
|
2019-09-18 13:15:37 +00:00
|
|
|
__all__ = ["DocBin"]
|