From 0f1beb5ff27bf19e14ddc3a8b80e2521a782c03c Mon Sep 17 00:00:00 2001
From: Ines Montani <ines@ines.io>
Date: Thu, 21 May 2020 20:05:03 +0200
Subject: [PATCH] Tidy up and avoid absolute spacy imports in core

---
 spacy/cli/evaluate.py |  3 +--
 spacy/kb.pxd          |  5 ++---
 spacy/kb.pyx          | 17 ++++++-----------
 spacy/language.py     |  5 +----
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/spacy/cli/evaluate.py b/spacy/cli/evaluate.py
index 8a84684e5..be994de73 100644
--- a/spacy/cli/evaluate.py
+++ b/spacy/cli/evaluate.py
@@ -2,7 +2,6 @@
 from __future__ import unicode_literals, division, print_function
 
 import plac
-import spacy
 from timeit import default_timer as timer
 from wasabi import msg
 
@@ -45,7 +44,7 @@ def evaluate(
         msg.fail("Visualization output directory not found", displacy_path, exits=1)
     corpus = GoldCorpus(data_path, data_path)
     if model.startswith("blank:"):
-        nlp = spacy.blank(model.replace("blank:", ""))
+        nlp = util.get_lang_class(model.replace("blank:", ""))()
     else:
         nlp = util.load_model(model)
     dev_docs = list(corpus.dev_docs(nlp, gold_preproc=gold_preproc))
diff --git a/spacy/kb.pxd b/spacy/kb.pxd
index d5aa382b1..518ce0f4e 100644
--- a/spacy/kb.pxd
+++ b/spacy/kb.pxd
@@ -6,7 +6,7 @@ from libcpp.vector cimport vector
 from libc.stdint cimport int32_t, int64_t
 from libc.stdio cimport FILE
 
-from spacy.vocab cimport Vocab
+from .vocab cimport Vocab
 from .typedefs cimport hash_t
 
 from .structs cimport KBEntryC, AliasC
@@ -113,7 +113,7 @@ cdef class KnowledgeBase:
         return new_index
 
     cdef inline void _create_empty_vectors(self, hash_t dummy_hash) nogil:
-        """ 
+        """
         Initializing the vectors and making sure the first element of each vector is a dummy,
         because the PreshMap maps pointing to indices in these vectors can not contain 0 as value
         cf. https://github.com/explosion/preshed/issues/17
@@ -169,4 +169,3 @@ cdef class Reader:
     cdef int read_alias(self, int64_t* entry_index, float* prob) except -1
 
     cdef int _read(self, void* value, size_t size) except -1
-
diff --git a/spacy/kb.pyx b/spacy/kb.pyx
index 36a6dbd93..076f25267 100644
--- a/spacy/kb.pyx
+++ b/spacy/kb.pyx
@@ -1,23 +1,20 @@
 # cython: infer_types=True
 # cython: profile=True
 # coding: utf8
-import warnings
-
-from spacy.errors import Errors, Warnings
-
-from pathlib import Path
 from cymem.cymem cimport Pool
 from preshed.maps cimport PreshMap
-
 from cpython.exc cimport PyErr_SetFromErrno
-
 from libc.stdio cimport fopen, fclose, fread, fwrite, feof, fseek
 from libc.stdint cimport int32_t, int64_t
+from libcpp.vector cimport vector
+
+import warnings
+from os import path
+from pathlib import Path
 
 from .typedefs cimport hash_t
 
-from os import path
-from libcpp.vector cimport vector
+from .errors import Errors, Warnings
 
 
 cdef class Candidate:
@@ -586,5 +583,3 @@ cdef class Reader:
     cdef int _read(self, void* value, size_t size) except -1:
         status = fread(value, size, 1, self._fp)
         return status
-
-
diff --git a/spacy/language.py b/spacy/language.py
index 0e5c46459..dae7d96a2 100644
--- a/spacy/language.py
+++ b/spacy/language.py
@@ -4,10 +4,7 @@ from __future__ import absolute_import, unicode_literals
 import random
 import itertools
 import warnings
-
 from thinc.extra import load_nlp
-
-from spacy.util import minibatch
 import weakref
 import functools
 from collections import OrderedDict
@@ -852,7 +849,7 @@ class Language(object):
             *[mp.Pipe(False) for _ in range(n_process)]
         )
 
-        batch_texts = minibatch(texts, batch_size)
+        batch_texts = util.minibatch(texts, batch_size)
         # Sender sends texts to the workers.
         # This is necessary to properly handle infinite length of texts.
         # (In this case, all data cannot be sent to the workers at once)