mirror of
https://github.com/explosion/spaCy.git
synced 2025-01-12 18:26:30 +03:00
43b960c01b
* Update with WIP * Update with WIP * Update with pipeline serialization * Update types and pipe factories * Add deep merge, tidy up and add tests * Fix pipe creation from config * Don't validate default configs on load * Update spacy/language.py Co-authored-by: Ines Montani <ines@ines.io> * Adjust factory/component meta error * Clean up factory args and remove defaults * Add test for failing empty dict defaults * Update pipeline handling and methods * provide KB as registry function instead of as object * small change in test to make functionality more clear * update example script for EL configuration * Fix typo * Simplify test * Simplify test * splitting pipes.pyx into separate files * moving default configs to each component file * fix batch_size type * removing default values from component constructors where possible (TODO: test 4725) * skip instead of xfail * Add test for config -> nlp with multiple instances * pipeline.pipes -> pipeline.pipe * Tidy up, document, remove kwargs * small cleanup/generalization for Tok2VecListener * use DEFAULT_UPSTREAM field * revert to avoid circular imports * Fix tests * Replace deprecated arg * Make model dirs require config * fix pickling of keyword-only arguments in constructor * WIP: clean up and integrate full config * Add helper to handle function args more reliably Now also includes keyword-only args * Fix config composition and serialization * Improve config debugging and add visual diff * Remove unused defaults and fix type * Remove pipeline and factories from meta * Update spacy/default_config.cfg Co-authored-by: Sofie Van Landeghem <svlandeg@users.noreply.github.com> * Update spacy/default_config.cfg * small UX edits * avoid printing stack trace for debug CLI commands * Add support for language-specific factories * specify the section of the config which holds the model to debug * WIP: add Language.from_config * Update with language data refactor WIP * Auto-format * Add backwards-compat handling for Language.factories * Update morphologizer.pyx * Fix morphologizer * Update and simplify lemmatizers * Fix Japanese tests * Port over tagger changes * Fix Chinese and tests * Update to latest Thinc * WIP: xfail first Russian lemmatizer test * Fix component-specific overrides * fix nO for output layers in debug_model * Fix default value * Fix tests and don't pass objects in config * Fix deep merging * Fix lemma lookup data registry Only load the lookups if an entry is available in the registry (and if spacy-lookups-data is installed) * Add types * Add Vocab.from_config * Fix typo * Fix tests * Make config copying more elegant * Fix pipe analysis * Fix lemmatizers and is_base_form * WIP: move language defaults to config * Fix morphology type * Fix vocab * Remove comment * Update to latest Thinc * Add morph rules to config * Tidy up * Remove set_morphology option from tagger factory * Hack use_gpu * Move [pipeline] to top-level block and make [nlp.pipeline] list Allows separating component blocks from component order – otherwise, ordering the config would mean a changed component order, which is bad. Also allows initial config to define more components and not use all of them * Fix use_gpu and resume in CLI * Auto-format * Remove resume from config * Fix formatting and error * [pipeline] -> [components] * Fix types * Fix tagger test: requires set_morphology? Co-authored-by: Sofie Van Landeghem <svlandeg@users.noreply.github.com> Co-authored-by: svlandeg <sofie.vanlandeghem@gmail.com> Co-authored-by: Matthew Honnibal <honnibal+gh@gmail.com>
168 lines
6.1 KiB
Python
168 lines
6.1 KiB
Python
import pytest
|
|
from spacy import registry
|
|
from spacy.pipeline import Tagger, DependencyParser, EntityRecognizer
|
|
from spacy.pipeline import TextCategorizer, SentenceRecognizer
|
|
from spacy.pipeline.dep_parser import DEFAULT_PARSER_MODEL
|
|
from spacy.pipeline.tagger import DEFAULT_TAGGER_MODEL
|
|
from spacy.pipeline.textcat import DEFAULT_TEXTCAT_MODEL
|
|
from spacy.pipeline.senter import DEFAULT_SENTER_MODEL
|
|
|
|
from ..util import make_tempdir
|
|
|
|
|
|
test_parsers = [DependencyParser, EntityRecognizer]
|
|
|
|
|
|
@pytest.fixture
|
|
def parser(en_vocab):
|
|
config = {
|
|
"learn_tokens": False,
|
|
"min_action_freq": 30,
|
|
"update_with_oracle_cut_size": 100,
|
|
}
|
|
model = registry.make_from_config({"model": DEFAULT_PARSER_MODEL}, validate=True)["model"]
|
|
parser = DependencyParser(en_vocab, model, **config)
|
|
parser.add_label("nsubj")
|
|
return parser
|
|
|
|
|
|
@pytest.fixture
|
|
def blank_parser(en_vocab):
|
|
config = {
|
|
"learn_tokens": False,
|
|
"min_action_freq": 30,
|
|
"update_with_oracle_cut_size": 100,
|
|
}
|
|
model = registry.make_from_config({"model": DEFAULT_PARSER_MODEL}, validate=True)["model"]
|
|
parser = DependencyParser(en_vocab, model, **config)
|
|
return parser
|
|
|
|
|
|
@pytest.fixture
|
|
def taggers(en_vocab):
|
|
model = registry.make_from_config({"model": DEFAULT_TAGGER_MODEL}, validate=True)["model"]
|
|
tagger1 = Tagger(en_vocab, model, set_morphology=True)
|
|
tagger2 = Tagger(en_vocab, model, set_morphology=True)
|
|
return tagger1, tagger2
|
|
|
|
|
|
@pytest.mark.parametrize("Parser", test_parsers)
|
|
def test_serialize_parser_roundtrip_bytes(en_vocab, Parser):
|
|
config = {
|
|
"learn_tokens": False,
|
|
"min_action_freq": 0,
|
|
"update_with_oracle_cut_size": 100,
|
|
}
|
|
model = registry.make_from_config({"model": DEFAULT_PARSER_MODEL}, validate=True)["model"]
|
|
parser = Parser(en_vocab, model, **config)
|
|
new_parser = Parser(en_vocab, model, **config)
|
|
new_parser = new_parser.from_bytes(parser.to_bytes(exclude=["vocab"]))
|
|
bytes_2 = new_parser.to_bytes(exclude=["vocab"])
|
|
bytes_3 = parser.to_bytes(exclude=["vocab"])
|
|
assert len(bytes_2) == len(bytes_3)
|
|
assert bytes_2 == bytes_3
|
|
|
|
|
|
@pytest.mark.parametrize("Parser", test_parsers)
|
|
def test_serialize_parser_roundtrip_disk(en_vocab, Parser):
|
|
config = {
|
|
"learn_tokens": False,
|
|
"min_action_freq": 0,
|
|
"update_with_oracle_cut_size": 100,
|
|
}
|
|
model = registry.make_from_config({"model": DEFAULT_PARSER_MODEL}, validate=True)["model"]
|
|
parser = Parser(en_vocab, model, **config)
|
|
with make_tempdir() as d:
|
|
file_path = d / "parser"
|
|
parser.to_disk(file_path)
|
|
parser_d = Parser(en_vocab, model, **config)
|
|
parser_d = parser_d.from_disk(file_path)
|
|
parser_bytes = parser.to_bytes(exclude=["model", "vocab"])
|
|
parser_d_bytes = parser_d.to_bytes(exclude=["model", "vocab"])
|
|
assert len(parser_bytes) == len(parser_d_bytes)
|
|
assert parser_bytes == parser_d_bytes
|
|
|
|
|
|
def test_to_from_bytes(parser, blank_parser):
|
|
assert parser.model is not True
|
|
assert blank_parser.model is not True
|
|
assert blank_parser.moves.n_moves != parser.moves.n_moves
|
|
bytes_data = parser.to_bytes(exclude=["vocab"])
|
|
|
|
# the blank parser needs to be resized before we can call from_bytes
|
|
blank_parser.model.attrs["resize_output"](blank_parser.model, parser.moves.n_moves)
|
|
blank_parser.from_bytes(bytes_data)
|
|
assert blank_parser.model is not True
|
|
assert blank_parser.moves.n_moves == parser.moves.n_moves
|
|
|
|
|
|
@pytest.mark.skip(
|
|
reason="This seems to be a dict ordering bug somewhere. Only failing on some platforms."
|
|
)
|
|
def test_serialize_tagger_roundtrip_bytes(en_vocab, taggers):
|
|
tagger1 = taggers[0]
|
|
tagger1_b = tagger1.to_bytes()
|
|
tagger1 = tagger1.from_bytes(tagger1_b)
|
|
assert tagger1.to_bytes() == tagger1_b
|
|
model = registry.make_from_config({"model": DEFAULT_TAGGER_MODEL}, validate=True)["model"]
|
|
new_tagger1 = Tagger(en_vocab, model).from_bytes(tagger1_b)
|
|
new_tagger1_b = new_tagger1.to_bytes()
|
|
assert len(new_tagger1_b) == len(tagger1_b)
|
|
assert new_tagger1_b == tagger1_b
|
|
|
|
|
|
def test_serialize_tagger_roundtrip_disk(en_vocab, taggers):
|
|
tagger1, tagger2 = taggers
|
|
with make_tempdir() as d:
|
|
file_path1 = d / "tagger1"
|
|
file_path2 = d / "tagger2"
|
|
tagger1.to_disk(file_path1)
|
|
tagger2.to_disk(file_path2)
|
|
model = registry.make_from_config({"model": DEFAULT_TAGGER_MODEL}, validate=True)["model"]
|
|
tagger1_d = Tagger(en_vocab, model, set_morphology=True).from_disk(file_path1)
|
|
tagger2_d = Tagger(en_vocab, model, set_morphology=True).from_disk(file_path2)
|
|
assert tagger1_d.to_bytes() == tagger2_d.to_bytes()
|
|
|
|
|
|
def test_serialize_textcat_empty(en_vocab):
|
|
# See issue #1105
|
|
model = registry.make_from_config({"model": DEFAULT_TEXTCAT_MODEL}, validate=True)["model"]
|
|
textcat = TextCategorizer(
|
|
en_vocab, model, labels=["ENTITY", "ACTION", "MODIFIER"]
|
|
)
|
|
textcat.to_bytes(exclude=["vocab"])
|
|
|
|
|
|
@pytest.mark.parametrize("Parser", test_parsers)
|
|
def test_serialize_pipe_exclude(en_vocab, Parser):
|
|
model = registry.make_from_config({"model": DEFAULT_PARSER_MODEL}, validate=True)["model"]
|
|
config = {
|
|
"learn_tokens": False,
|
|
"min_action_freq": 0,
|
|
"update_with_oracle_cut_size": 100,
|
|
}
|
|
def get_new_parser():
|
|
new_parser = Parser(en_vocab, model, **config)
|
|
return new_parser
|
|
|
|
parser = Parser(en_vocab, model, **config)
|
|
parser.cfg["foo"] = "bar"
|
|
new_parser = get_new_parser().from_bytes(parser.to_bytes(exclude=["vocab"]))
|
|
assert "foo" in new_parser.cfg
|
|
new_parser = get_new_parser().from_bytes(
|
|
parser.to_bytes(exclude=["vocab"]), exclude=["cfg"]
|
|
)
|
|
assert "foo" not in new_parser.cfg
|
|
new_parser = get_new_parser().from_bytes(
|
|
parser.to_bytes(exclude=["cfg"]), exclude=["vocab"]
|
|
)
|
|
assert "foo" not in new_parser.cfg
|
|
|
|
|
|
def test_serialize_sentencerecognizer(en_vocab):
|
|
model = registry.make_from_config({"model": DEFAULT_SENTER_MODEL}, validate=True)["model"]
|
|
sr = SentenceRecognizer(en_vocab, model)
|
|
sr_b = sr.to_bytes()
|
|
sr_d = SentenceRecognizer(en_vocab, model).from_bytes(sr_b)
|
|
assert sr.to_bytes() == sr_d.to_bytes()
|