2017-03-15 16:37:18 +00:00
|
|
|
# coding: utf8
|
|
|
|
from __future__ import unicode_literals
|
2016-03-24 10:19:43 +00:00
|
|
|
|
2017-05-22 10:28:58 +00:00
|
|
|
import plac
|
2018-05-20 18:26:56 +00:00
|
|
|
import requests
|
2017-03-18 11:59:41 +00:00
|
|
|
import os
|
2017-03-18 18:29:36 +00:00
|
|
|
import subprocess
|
|
|
|
import sys
|
|
|
|
|
2018-04-03 13:50:31 +00:00
|
|
|
from ._messages import Messages
|
2018-05-20 18:26:56 +00:00
|
|
|
from .link import link
|
2017-08-09 09:52:38 +00:00
|
|
|
from ..util import prints, get_package_path
|
2017-03-18 14:14:48 +00:00
|
|
|
from .. import about
|
2016-03-24 10:19:43 +00:00
|
|
|
|
|
|
|
|
2017-05-22 10:28:58 +00:00
|
|
|
@plac.annotations(
|
💫 Port master changes over to develop (#2979)
* Create aryaprabhudesai.md (#2681)
* Update _install.jade (#2688)
Typo fix: "models" -> "model"
* Add FAC to spacy.explain (resolves #2706)
* Remove docstrings for deprecated arguments (see #2703)
* When calling getoption() in conftest.py, pass a default option (#2709)
* When calling getoption() in conftest.py, pass a default option
This is necessary to allow testing an installed spacy by running:
pytest --pyargs spacy
* Add contributor agreement
* update bengali token rules for hyphen and digits (#2731)
* Less norm computations in token similarity (#2730)
* Less norm computations in token similarity
* Contributor agreement
* Remove ')' for clarity (#2737)
Sorry, don't mean to be nitpicky, I just noticed this when going through the CLI and thought it was a quick fix. That said, if this was intention than please let me know.
* added contributor agreement for mbkupfer (#2738)
* Basic support for Telugu language (#2751)
* Lex _attrs for polish language (#2750)
* Signed spaCy contributor agreement
* Added polish version of english lex_attrs
* Introduces a bulk merge function, in order to solve issue #653 (#2696)
* Fix comment
* Introduce bulk merge to increase performance on many span merges
* Sign contributor agreement
* Implement pull request suggestions
* Describe converters more explicitly (see #2643)
* Add multi-threading note to Language.pipe (resolves #2582) [ci skip]
* Fix formatting
* Fix dependency scheme docs (closes #2705) [ci skip]
* Don't set stop word in example (closes #2657) [ci skip]
* Add words to portuguese language _num_words (#2759)
* Add words to portuguese language _num_words
* Add words to portuguese language _num_words
* Update Indonesian model (#2752)
* adding e-KTP in tokenizer exceptions list
* add exception token
* removing lines with containing space as it won't matter since we use .split() method in the end, added new tokens in exception
* add tokenizer exceptions list
* combining base_norms with norm_exceptions
* adding norm_exception
* fix double key in lemmatizer
* remove unused import on punctuation.py
* reformat stop_words to reduce number of lines, improve readibility
* updating tokenizer exception
* implement is_currency for lang/id
* adding orth_first_upper in tokenizer_exceptions
* update the norm_exception list
* remove bunch of abbreviations
* adding contributors file
* Fixed spaCy+Keras example (#2763)
* bug fixes in keras example
* created contributor agreement
* Adding French hyphenated first name (#2786)
* Fix typo (closes #2784)
* Fix typo (#2795) [ci skip]
Fixed typo on line 6 "regcognizer --> recognizer"
* Adding basic support for Sinhala language. (#2788)
* adding Sinhala language package, stop words, examples and lex_attrs.
* Adding contributor agreement
* Updating contributor agreement
* Also include lowercase norm exceptions
* Fix error (#2802)
* Fix error
ValueError: cannot resize an array that references or is referenced
by another array in this way. Use the resize function
* added spaCy Contributor Agreement
* Add charlax's contributor agreement (#2805)
* agreement of contributor, may I introduce a tiny pl languge contribution (#2799)
* Contributors agreement
* Contributors agreement
* Contributors agreement
* Add jupyter=True to displacy.render in documentation (#2806)
* Revert "Also include lowercase norm exceptions"
This reverts commit 70f4e8adf37cfcfab60be2b97d6deae949b30e9e.
* Remove deprecated encoding argument to msgpack
* Set up dependency tree pattern matching skeleton (#2732)
* Fix bug when too many entity types. Fixes #2800
* Fix Python 2 test failure
* Require older msgpack-numpy
* Restore encoding arg on msgpack-numpy
* Try to fix version pin for msgpack-numpy
* Update Portuguese Language (#2790)
* Add words to portuguese language _num_words
* Add words to portuguese language _num_words
* Portuguese - Add/remove stopwords, fix tokenizer, add currency symbols
* Extended punctuation and norm_exceptions in the Portuguese language
* Correct error in spacy universe docs concerning spacy-lookup (#2814)
* Update Keras Example for (Parikh et al, 2016) implementation (#2803)
* bug fixes in keras example
* created contributor agreement
* baseline for Parikh model
* initial version of parikh 2016 implemented
* tested asymmetric models
* fixed grevious error in normalization
* use standard SNLI test file
* begin to rework parikh example
* initial version of running example
* start to document the new version
* start to document the new version
* Update Decompositional Attention.ipynb
* fixed calls to similarity
* updated the README
* import sys package duh
* simplified indexing on mapping word to IDs
* stupid python indent error
* added code from https://github.com/tensorflow/tensorflow/issues/3388 for tf bug workaround
* Fix typo (closes #2815) [ci skip]
* Update regex version dependency
* Set version to 2.0.13.dev3
* Skip seemingly problematic test
* Remove problematic test
* Try previous version of regex
* Revert "Remove problematic test"
This reverts commit bdebbef45552d698d390aa430b527ee27830f11b.
* Unskip test
* Try older version of regex
* 💫 Update training examples and use minibatching (#2830)
<!--- Provide a general summary of your changes in the title. -->
## Description
Update the training examples in `/examples/training` to show usage of spaCy's `minibatch` and `compounding` helpers ([see here](https://spacy.io/usage/training#tips-batch-size) for details). The lack of batching in the examples has caused some confusion in the past, especially for beginners who would copy-paste the examples, update them with large training sets and experienced slow and unsatisfying results.
### Types of change
enhancements
## 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.
* Visual C++ link updated (#2842) (closes #2841) [ci skip]
* New landing page
* Add contribution agreement
* Correcting lang/ru/examples.py (#2845)
* Correct some grammatical inaccuracies in lang\ru\examples.py; filled Contributor Agreement
* Correct some grammatical inaccuracies in lang\ru\examples.py
* Move contributor agreement to separate file
* Set version to 2.0.13.dev4
* Add Persian(Farsi) language support (#2797)
* Also include lowercase norm exceptions
* Remove in favour of https://github.com/explosion/spaCy/graphs/contributors
* Rule-based French Lemmatizer (#2818)
<!--- Provide a general summary of your changes in the title. -->
## Description
<!--- Use this section to describe your changes. If your changes required
testing, include information about the testing environment and the tests you
ran. If your test fixes a bug reported in an issue, don't forget to include the
issue number. If your PR is still a work in progress, that's totally fine – just
include a note to let us know. -->
Add a rule-based French Lemmatizer following the english one and the excellent PR for [greek language optimizations](https://github.com/explosion/spaCy/pull/2558) to adapt the Lemmatizer class.
### Types of change
<!-- What type of change does your PR cover? Is it a bug fix, an enhancement
or new feature, or a change to the documentation? -->
- Lemma dictionary used can be found [here](http://infolingu.univ-mlv.fr/DonneesLinguistiques/Dictionnaires/telechargement.html), I used the XML version.
- Add several files containing exhaustive list of words for each part of speech
- Add some lemma rules
- Add POS that are not checked in the standard Lemmatizer, i.e PRON, DET, ADV and AUX
- Modify the Lemmatizer class to check in lookup table as a last resort if POS not mentionned
- Modify the lemmatize function to check in lookup table as a last resort
- Init files are updated so the model can support all the functionalities mentioned above
- Add words to tokenizer_exceptions_list.py in respect to regex used in tokenizer_exceptions.py
## 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.
* Set version to 2.0.13
* Fix formatting and consistency
* Update docs for new version [ci skip]
* Increment version [ci skip]
* Add info on wheels [ci skip]
* Adding "This is a sentence" example to Sinhala (#2846)
* Add wheels badge
* Update badge [ci skip]
* Update README.rst [ci skip]
* Update murmurhash pin
* Increment version to 2.0.14.dev0
* Update GPU docs for v2.0.14
* Add wheel to setup_requires
* Import prefer_gpu and require_gpu functions from Thinc
* Add tests for prefer_gpu() and require_gpu()
* Update requirements and setup.py
* Workaround bug in thinc require_gpu
* Set version to v2.0.14
* Update push-tag script
* Unhack prefer_gpu
* Require thinc 6.10.6
* Update prefer_gpu and require_gpu docs [ci skip]
* Fix specifiers for GPU
* Set version to 2.0.14.dev1
* Set version to 2.0.14
* Update Thinc version pin
* Increment version
* Fix msgpack-numpy version pin
* Increment version
* Update version to 2.0.16
* Update version [ci skip]
* Redundant ')' in the Stop words' example (#2856)
<!--- Provide a general summary of your changes in the title. -->
## Description
<!--- Use this section to describe your changes. If your changes required
testing, include information about the testing environment and the tests you
ran. If your test fixes a bug reported in an issue, don't forget to include the
issue number. If your PR is still a work in progress, that's totally fine – just
include a note to let us know. -->
### Types of change
<!-- What type of change does your PR cover? Is it a bug fix, an enhancement
or new feature, or a change to the documentation? -->
## Checklist
<!--- Before you submit the PR, go over this checklist and make sure you can
tick off all the boxes. [] -> [x] -->
- [ ] I have submitted the spaCy Contributor Agreement.
- [ ] I ran the tests, and all new and existing tests passed.
- [ ] My changes don't require a change to the documentation, or if they do, I've added all required information.
* Documentation improvement regarding joblib and SO (#2867)
Some documentation improvements
## Description
1. Fixed the dead URL to joblib
2. Fixed Stack Overflow brand name (with space)
### Types of change
Documentation
## 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.
* raise error when setting overlapping entities as doc.ents (#2880)
* Fix out-of-bounds access in NER training
The helper method state.B(1) gets the index of the first token of the
buffer, or -1 if no such token exists. Normally this is safe because we
pass this to functions like state.safe_get(), which returns an empty
token. Here we used it directly as an array index, which is not okay!
This error may have been the cause of out-of-bounds access errors during
training. Similar errors may still be around, so much be hunted down.
Hunting this one down took a long time...I printed out values across
training runs and diffed, looking for points of divergence between
runs, when no randomness should be allowed.
* Change PyThaiNLP Url (#2876)
* Fix missing comma
* Add example showing a fix-up rule for space entities
* Set version to 2.0.17.dev0
* Update regex version
* Revert "Update regex version"
This reverts commit 62358dd867d15bc6a475942dff34effba69dd70a.
* Try setting older regex version, to align with conda
* Set version to 2.0.17
* Add spacy-js to universe [ci-skip]
* Add spacy-raspberry to universe (closes #2889)
* Add script to validate universe json [ci skip]
* Removed space in docs + added contributor indo (#2909)
* - removed unneeded space in documentation
* - added contributor info
* Allow input text of length up to max_length, inclusive (#2922)
* Include universe spec for spacy-wordnet component (#2919)
* feat: include universe spec for spacy-wordnet component
* chore: include spaCy contributor agreement
* Minor formatting changes [ci skip]
* Fix image [ci skip]
Twitter URL doesn't work on live site
* Check if the word is in one of the regular lists specific to each POS (#2886)
* 💫 Create random IDs for SVGs to prevent ID clashes (#2927)
Resolves #2924.
## Description
Fixes problem where multiple visualizations in Jupyter notebooks would have clashing arc IDs, resulting in weirdly positioned arc labels. Generating a random ID prefix so even identical parses won't receive the same IDs for consistency (even if effect of ID clash isn't noticable here.)
### Types of change
bug fix
## 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.
* Fix typo [ci skip]
* fixes symbolic link on py3 and windows (#2949)
* fixes symbolic link on py3 and windows
during setup of spacy using command
python -m spacy link en_core_web_sm en
closes #2948
* Update spacy/compat.py
Co-Authored-By: cicorias <cicorias@users.noreply.github.com>
* Fix formatting
* Update universe [ci skip]
* Catalan Language Support (#2940)
* Catalan language Support
* Ddding Catalan to documentation
* Sort languages alphabetically [ci skip]
* Update tests for pytest 4.x (#2965)
<!--- Provide a general summary of your changes in the title. -->
## Description
- [x] Replace marks in params for pytest 4.0 compat ([see here](https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize))
- [x] Un-xfail passing tests (some fixes in a recent update resolved a bunch of issues, but tests were apparently never updated here)
### Types of change
<!-- What type of change does your PR cover? Is it a bug fix, an enhancement
or new feature, or a change to the documentation? -->
## 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.
* Fix regex pin to harmonize with conda (#2964)
* Update README.rst
* Fix bug where Vocab.prune_vector did not use 'batch_size' (#2977)
Fixes #2976
* Fix typo
* Fix typo
* Remove duplicate file
* Require thinc 7.0.0.dev2
Fixes bug in gpu_ops that would use cupy instead of numpy on CPU
* Add missing import
* Fix error IDs
* Fix tests
2018-11-29 15:30:29 +00:00
|
|
|
model=("model to download, shortcut or name", "positional", None, str),
|
2017-05-22 10:28:58 +00:00
|
|
|
direct=("force direct download. Needs model name with version and won't "
|
2018-05-03 16:37:02 +00:00
|
|
|
"perform compatibility check", "flag", "d", bool),
|
2018-05-20 18:26:56 +00:00
|
|
|
pip_args=("additional arguments to be passed to `pip install` when "
|
|
|
|
"installing the model"))
|
|
|
|
def download(model, direct=False, *pip_args):
|
2017-05-27 18:01:46 +00:00
|
|
|
"""
|
|
|
|
Download compatible model from default download path using pip. Model
|
2017-05-22 10:28:58 +00:00
|
|
|
can be shortcut, model name or, if --direct flag is set, full model name
|
|
|
|
with version.
|
|
|
|
"""
|
2017-03-15 16:37:18 +00:00
|
|
|
if direct:
|
2018-05-20 18:26:56 +00:00
|
|
|
dl = download_model('{m}/{m}.tar.gz#egg={m}'.format(m=model), pip_args)
|
2017-03-15 16:37:18 +00:00
|
|
|
else:
|
2018-05-20 18:26:56 +00:00
|
|
|
shortcuts = get_json(about.__shortcuts__, "available shortcuts")
|
2017-05-07 21:25:29 +00:00
|
|
|
model_name = shortcuts.get(model, model)
|
2018-05-20 18:26:56 +00:00
|
|
|
compatibility = get_compatibility()
|
2017-03-16 18:54:51 +00:00
|
|
|
version = get_version(model_name, compatibility)
|
2018-05-20 18:26:56 +00:00
|
|
|
dl = download_model('{m}-{v}/{m}-{v}.tar.gz#egg={m}=={v}'
|
|
|
|
.format(m=model_name, v=version), pip_args)
|
2018-04-03 13:50:31 +00:00
|
|
|
if dl != 0: # if download subprocess doesn't return 0, exit
|
2018-01-03 20:03:36 +00:00
|
|
|
sys.exit(dl)
|
|
|
|
try:
|
|
|
|
# Get package path here because link uses
|
|
|
|
# pip.get_installed_distributions() to check if model is a
|
|
|
|
# package, which fails if model was just installed via
|
|
|
|
# subprocess
|
|
|
|
package_path = get_package_path(model_name)
|
2018-05-07 21:02:11 +00:00
|
|
|
link(model_name, model, force=True, model_path=package_path)
|
2018-01-03 20:03:36 +00:00
|
|
|
except:
|
|
|
|
# Dirty, but since spacy.download and the auto-linking is
|
|
|
|
# mostly a convenience wrapper, it's best to show a success
|
|
|
|
# message and loading instructions, even if linking fails.
|
2018-11-16 12:08:20 +00:00
|
|
|
prints(Messages.M001, title=Messages.M002.format(name=model_name))
|
2017-03-16 22:23:26 +00:00
|
|
|
|
2018-01-03 19:14:50 +00:00
|
|
|
|
2018-05-20 18:26:56 +00:00
|
|
|
def get_json(url, desc):
|
|
|
|
r = requests.get(url)
|
|
|
|
if r.status_code != 200:
|
|
|
|
prints(Messages.M004.format(desc=desc, version=about.__version__),
|
|
|
|
title=Messages.M003.format(code=r.status_code), exits=1)
|
|
|
|
return r.json()
|
2017-04-26 16:00:28 +00:00
|
|
|
|
|
|
|
|
2018-05-20 18:26:56 +00:00
|
|
|
def get_compatibility():
|
2017-04-26 16:00:28 +00:00
|
|
|
version = about.__version__
|
2017-11-08 17:40:21 +00:00
|
|
|
version = version.rsplit('.dev', 1)[0]
|
2018-05-20 18:26:56 +00:00
|
|
|
comp_table = get_json(about.__compatibility__, "compatibility table")
|
2017-04-26 16:00:28 +00:00
|
|
|
comp = comp_table['spacy']
|
2017-03-15 16:37:18 +00:00
|
|
|
if version not in comp:
|
2018-04-03 13:50:31 +00:00
|
|
|
prints(Messages.M006.format(version=version), title=Messages.M005,
|
|
|
|
exits=1)
|
2017-04-26 16:00:28 +00:00
|
|
|
return comp[version]
|
2017-03-15 16:37:18 +00:00
|
|
|
|
|
|
|
|
|
|
|
def get_version(model, comp):
|
2017-11-08 17:03:52 +00:00
|
|
|
model = model.rsplit('.dev', 1)[0]
|
2017-03-15 16:37:18 +00:00
|
|
|
if model not in comp:
|
2018-04-03 13:50:31 +00:00
|
|
|
prints(Messages.M007.format(name=model, version=about.__version__),
|
|
|
|
title=Messages.M005, exits=1)
|
2017-03-15 16:37:18 +00:00
|
|
|
return comp[model][0]
|
|
|
|
|
|
|
|
|
2018-05-20 18:26:56 +00:00
|
|
|
def download_model(filename, user_pip_args=None):
|
2017-03-18 18:29:36 +00:00
|
|
|
download_url = about.__download_url__ + '/' + filename
|
2018-05-20 18:26:56 +00:00
|
|
|
pip_args = ['--no-cache-dir', '--no-deps']
|
|
|
|
if user_pip_args:
|
|
|
|
pip_args.extend(user_pip_args)
|
|
|
|
cmd = [sys.executable, '-m', 'pip', 'install'] + pip_args + [download_url]
|
|
|
|
return subprocess.call(cmd, env=os.environ.copy())
|