NEL benchmark: update spaCy version (#182)

* Update spaCy version in project.yml to account for InMemoryLookupKB usage in wikid.

* Add compat.py for importing the correct KnowledgeBase class.

* Modify compat imports.

* Modify compat imports.

Author: rmitsch

benchmarks/nel/project.yml

@@ -1,6 +1,6 @@
 title: 'NEL Benchmark'
 description: "Pipeline for benchmarking NEL approaches (incl. candidate generation and entity disambiguation)."
-spacy_version: ">=3.0.0,<3.5.0"
+spacy_version: ">=3.0.0,<3.6.0"
 vars:
   run: "cg-default"
   language: "en"

benchmarks/nel/scripts/candidate_generation/base.py

@@ -5,9 +5,10 @@
 
 import spacy
 from spacy import Language
-from spacy.kb import KnowledgeBase, Candidate
+from spacy.kb import Candidate
 from spacy.tokens import Span
 
+from compat import KnowledgeBase
 from datasets.dataset import Dataset
 
 

benchmarks/nel/scripts/candidate_generation/embeddings.py

@@ -1,13 +1,12 @@
 """ Candidate generation via distance in embedding space. """
-import time
 from typing import Iterable, List, Set
 
 import numpy
 from sklearn.neighbors import NearestNeighbors
 
-from spacy.kb import KnowledgeBase
 from spacy.tokens import Span
 from .base import NearestNeighborCandidateSelector
+from compat import KnowledgeBase
 from rapidfuzz.string_metric import normalized_levenshtein
 
 

benchmarks/nel/scripts/candidate_generation/lexical.py

@@ -1,9 +1,9 @@
 """ Candidate generation via distance in lexical space. """
 from typing import Iterable
 
-from spacy.kb import KnowledgeBase, Candidate
 from spacy.tokens import Span
 from .base import NearestNeighborCandidateSelector
+from compat import KnowledgeBase
 from cfuzzyset import cFuzzySet as FuzzySet
 
 

benchmarks/nel/scripts/compat.py

@@ -0,0 +1,4 @@
+try:
+    from spacy.kb import InMemoryLookupKB as KnowledgeBase
+except ImportError:
+    from spacy.kb import KnowledgeBase as KnowledgeBase

benchmarks/nel/scripts/custom_functions.py

@@ -4,9 +4,10 @@
 from typing import Iterable, Callable
 import typing
 import spacy
-from spacy.kb import Candidate, KnowledgeBase
+from spacy.kb import Candidate
 from spacy.tokens import Span
 
+from compat import KnowledgeBase
 from scripts.candidate_generation import embeddings
 from scripts.candidate_generation import lexical
 

benchmarks/nel/scripts/datasets/dataset.py

@@ -17,14 +17,14 @@
 import tqdm
 import yaml
 from spacy import Language
-from spacy.kb import KnowledgeBase
 from spacy.pipeline.legacy import EntityLinker_v1
 from spacy.tokens import Doc, DocBin
 from spacy.training import Example
 from spacy.pipeline import EntityLinker
 
 from wikid import schemas
 from . import evaluation
+from compat import KnowledgeBase
 from utils import get_logger
 
 logger = get_logger(__name__)

benchmarks/nel/scripts/datasets/evaluation.py

@@ -10,7 +10,7 @@
 from typing import Dict, List, Set, Tuple, Optional
 
 import prettytable
-from spacy.kb import KnowledgeBase, Candidate
+from spacy.kb import Candidate
 from spacy.tokens import Doc
 from utils import get_logger