Skip to content

Commit

Permalink
Add compatibility with spacy 3.0 (#10)
Browse files Browse the repository at this point in the history
* Add component factory to support spacy 3.0

* Update readme to reflect spacy 3.0 usage

* show spacy 2.x initialization

Co-authored-by: Francisco Aranda <frascuchon@gmail.com>
  • Loading branch information
Hydroptix and frascuchon committed Apr 13, 2021
1 parent 6425cb2 commit e1d0641
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
5 changes: 4 additions & 1 deletion README.md
Expand Up @@ -44,7 +44,10 @@ from spacy_wordnet.wordnet_annotator import WordnetAnnotator

# Load an spacy model (supported models are "es", "en" and "pt")
nlp = spacy.load('en')
nlp.add_pipe(WordnetAnnotator(nlp.lang), after='tagger')
# Spacy 3.x
nlp.add_pipe("spacy_wordnet", after='tagger', config={'lang': nlp.lang})
# Spacy 2.x
# self.nlp_en.add_pipe(WordnetAnnotator(self.nlp_en.lang))
token = nlp('prices')[0]

# wordnet object link spacy token with nltk wordnet interface by giving acces to
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -16,4 +16,4 @@
# scipy==1.0

nltk>=3.4.5,<3.6
spacy>=2.0,<3.0
spacy>=2.0,<4.0
4 changes: 4 additions & 0 deletions spacy_wordnet/wordnet_annotator.py
@@ -1,8 +1,12 @@
from spacy.tokens.doc import Doc
from spacy.tokens.token import Token
from spacy.language import Language

from spacy_wordnet.wordnet_domains import Wordnet, load_wordnet_domains

@Language.factory("spacy_wordnet", default_config={"lang": "en"})
def wordnet_annotator(nlp, name, lang: str):
return WordnetAnnotator(lang=lang)

class WordnetAnnotator(object):
__FIELD = 'wordnet'
Expand Down
2 changes: 1 addition & 1 deletion tests/example.py
Expand Up @@ -8,7 +8,7 @@

# Load an spacy model (supported models are "es" and "en")
nlp = spacy.load('en')
nlp.add_pipe(WordnetAnnotator(nlp.lang), after='tagger')
nlp.add_pipe("spacy_wordnet", after='tagger')
token = nlp('prices')[0]

# wordnet object link spacy token with nltk wordnet interface by giving acces to
Expand Down
8 changes: 4 additions & 4 deletions tests/test_wordnet_annotator.py
Expand Up @@ -16,12 +16,12 @@ def __init__(self, *args, **kwargs):

super().__init__(*args, **kwargs)

self.nlp_en = spacy.load('en')
self.nlp_es = spacy.load('es')
self.nlp_en = spacy.load('en_core_web_sm')
self.nlp_es = spacy.load('es_core_news_sm')

# Add wordnet component
self.nlp_en.add_pipe(WordnetAnnotator(self.nlp_en.lang))
self.nlp_es.add_pipe(WordnetAnnotator(self.nlp_es.lang))
self.nlp_en.add_pipe("spacy_wordnet", config={'lang': self.nlp_en.lang})
self.nlp_es.add_pipe("spacy_wordnet", config={'lang': self.nlp_es.lang})

def test_english_annotations(self):

Expand Down

0 comments on commit e1d0641

Please sign in to comment.