isort

spacy/ml/models/parser.py

@@ -1,13 +1,14 @@
-from typing import Optional, List, cast
+from typing import List, Optional, cast
-from thinc.api import Model, chain, list2array, Linear, zero_init, use_ops
+
+from thinc.api import Linear, Model, chain, list2array, use_ops, zero_init
 from thinc.types import Floats2d
 
-from ...errors import Errors
 from ...compat import Literal
+from ...errors import Errors
+from ...tokens import Doc
 from ...util import registry
 from .._precomputable_affine import PrecomputableAffine
 from ..tb_framework import TransitionModel
-from ...tokens import Doc
 
 
 @registry.architectures("spacy.TransitionBasedParser.v2")

spacy/ml/parser_model.pxd

@@ -1,7 +1,8 @@
-from libc.string cimport memset, memcpy
+from libc.string cimport memcpy, memset
 from thinc.backends.cblas cimport CBlas
-from ..typedefs cimport weight_t, hash_t
+
 from ..pipeline._parser_internals._state cimport StateC
+from ..typedefs cimport hash_t, weight_t
 
 
 cdef struct SizesC:

spacy/ml/parser_model.pyx

@@ -1,18 +1,19 @@
 # cython: infer_types=True, cdivision=True, boundscheck=False
 cimport numpy as np
 from libc.math cimport exp
-from libc.string cimport memset, memcpy
 from libc.stdlib cimport calloc, free, realloc
+from libc.string cimport memcpy, memset
 from thinc.backends.cblas cimport saxpy, sgemm
 
 import numpy
 import numpy.random
-from thinc.api import Model, CupyOps, NumpyOps, get_ops
+from thinc.api import CupyOps, Model, NumpyOps, get_ops
 
 from .. import util
 from ..errors import Errors
-from ..typedefs cimport weight_t, class_t, hash_t
+
 from ..pipeline._parser_internals.stateclass cimport StateClass
+from ..typedefs cimport class_t, hash_t, weight_t
 
 
 cdef WeightsC get_c_weights(model) except *:

spacy/ml/tb_framework.py

@@ -1,6 +1,7 @@
 from thinc.api import Model, noop
-from .parser_model import ParserStepModel
+
 from ..util import registry
+from .parser_model import ParserStepModel
 
 
 @registry.layers("spacy.TransitionModel.v1")

spacy/pipeline/_parser_internals/_state.pxd

@@ -1,4 +1,5 @@
 cimport libcpp
+from cpython.exc cimport PyErr_CheckSignals, PyErr_SetFromErrno
 from cython.operator cimport dereference as deref
 from cython.operator cimport preincrement as incr
 from libc.stdint cimport uint32_t, uint64_t
@@ -7,8 +8,6 @@ from libc.string cimport memcpy, memset
 from libcpp.set cimport set
 from libcpp.unordered_map cimport unordered_map
 from libcpp.vector cimport vector
-from libcpp.set cimport set
-from cpython.exc cimport PyErr_CheckSignals, PyErr_SetFromErrno
 from murmurhash.mrmr cimport hash64
 
 from ...attrs cimport IS_SPACE

spacy/pipeline/dep_parser.pyx

@@ -5,8 +5,9 @@ from typing import Callable, Optional
 from thinc.api import Config, Model
 
 from ._parser_internals.transition_system import TransitionSystem
-from .transition_parser cimport Parser
+
 from ._parser_internals.arc_eager cimport ArcEager
+from .transition_parser cimport Parser
 
 from ..language import Language
 from ..scorer import Scorer

spacy/pipeline/ner.pyx

@@ -10,13 +10,14 @@ from ..training import remove_bilu_prefix
 from ..util import registry
 from ._parser_internals.ner import BiluoPushDown
 from ._parser_internals.transition_system import TransitionSystem
-from .transition_parser cimport Parser
-from ._parser_internals.ner cimport BiluoPushDown
-from ..language import Language
-from ..scorer import get_ner_prf, PRFScore
-from ..util import registry
-from ..training import remove_bilu_prefix
 
+from ._parser_internals.ner cimport BiluoPushDown
+from .transition_parser cimport Parser
+
+from ..language import Language
+from ..scorer import PRFScore, get_ner_prf
+from ..training import remove_bilu_prefix
+from ..util import registry
 
 default_model_config = """
 [model]

spacy/pipeline/transition_parser.pxd

@@ -1,11 +1,11 @@
 from cymem.cymem cimport Pool
 from thinc.backends.cblas cimport CBlas
 
+from ..ml.parser_model cimport ActivationsC, SizesC, WeightsC
 from ..vocab cimport Vocab
-from .trainable_pipe cimport TrainablePipe
-from ._parser_internals.transition_system cimport Transition, TransitionSystem
 from ._parser_internals._state cimport StateC
-from ..ml.parser_model cimport WeightsC, ActivationsC, SizesC
+from ._parser_internals.transition_system cimport Transition, TransitionSystem
+from .trainable_pipe cimport TrainablePipe
 
 
 cdef class Parser(TrainablePipe):

spacy/pipeline/transition_parser.pyx

@@ -1,20 +1,19 @@
 # cython: infer_types=True, cdivision=True, boundscheck=False, binding=True
 from __future__ import print_function
+
 from typing import Dict, Iterable, List, Optional, Tuple
-from cymem.cymem cimport Pool
+
 cimport numpy as np
+from cymem.cymem cimport Pool
+
 from itertools import islice
-from libcpp.vector cimport vector
+
-from libc.string cimport memset, memcpy
 from libc.stdlib cimport calloc, free
+from libc.string cimport memcpy, memset
+from libcpp.vector cimport vector
+
 import random
 
-import srsly
-from thinc.api import get_ops, set_dropout_rate, CupyOps, NumpyOps, Optimizer
-from thinc.api import chain, softmax_activation, use_ops
-from thinc.legacy import LegacySequenceCategoricalCrossentropy
-from thinc.types import Floats2d
-import numpy.random
 import numpy
 import numpy.random
 import srsly
@@ -22,21 +21,36 @@ from thinc.api import (
     CupyOps,
     NumpyOps,
     Optimizer,
+    chain,
     get_array_module,
     get_ops,
     set_dropout_rate,
+    softmax_activation,
+    use_ops,
 )
+from thinc.legacy import LegacySequenceCategoricalCrossentropy
 from thinc.types import Floats2d, Ints1d
 
-from ._parser_internals.stateclass cimport StateClass
+from ..ml.parser_model cimport (
-from ._parser_internals.search cimport Beam
+    ActivationsC,
-from ..ml.parser_model cimport alloc_activations, free_activations
+    SizesC,
-from ..ml.parser_model cimport predict_states, arg_max_if_valid
+    WeightsC,
-from ..ml.parser_model cimport WeightsC, ActivationsC, SizesC, cpu_log_loss
+    alloc_activations,
-from ..ml.parser_model cimport get_c_weights, get_c_sizes
+    arg_max_if_valid,
+    cpu_log_loss,
+    free_activations,
+    get_c_sizes,
+    get_c_weights,
+    predict_states,
+)
 from ..tokens.doc cimport Doc
+from ._parser_internals.search cimport Beam
+from ._parser_internals.stateclass cimport StateClass
+
 from .trainable_pipe import TrainablePipe
+
 from ._parser_internals cimport _beam_utils
+
 from ._parser_internals import _beam_utils
 
 from ..tokens.doc cimport Doc
@@ -56,7 +70,6 @@ from ..training import (
 )
 from ._parser_internals import _beam_utils
 
-
 NUMPY_OPS = NumpyOps()
 
 

spacy/tests/parser/test_ner.py

@@ -17,7 +17,6 @@ from spacy.pipeline.ner import DEFAULT_NER_MODEL
 from spacy.tokens import Doc, Span
 from spacy.training import Example, iob_to_biluo, split_bilu_label
 from spacy.vocab import Vocab
-import logging
 
 from ..util import make_tempdir
 

spacy/tests/test_misc.py

@@ -1,6 +1,7 @@
 import ctypes
 import os
 from pathlib import Path
+
 import pytest
 
 try:
@@ -8,15 +9,16 @@ try:
 except ImportError:
     from pydantic import ValidationError  # type: ignore
 
-from spacy.about import __version__ as spacy_version
+from thinc.api import (
-from spacy import util
+    Config,
-from spacy import prefer_gpu, require_gpu, require_cpu
+    ConfigValidationError,
-from spacy.ml._precomputable_affine import PrecomputableAffine
+    CupyOps,
-from spacy.ml._precomputable_affine import _backprop_precomputable_affine_padding
+    MPSOps,
-from spacy.util import dot_to_object, SimpleFrozenList, import_file
+    NumpyOps,
-from spacy.util import to_ternary_int, find_available_port
+    Optimizer,
-from thinc.api import Config, Optimizer, ConfigValidationError
+    get_current_ops,
-from thinc.api import get_current_ops, set_current_ops, NumpyOps, CupyOps, MPSOps
+    set_current_ops,
+)
 from thinc.compat import has_cupy_gpu, has_torch_mps_gpu
 
 from spacy import prefer_gpu, require_cpu, require_gpu, util
@@ -24,6 +26,10 @@ from spacy.about import __version__ as spacy_version
 from spacy.lang.en import English
 from spacy.lang.nl import Dutch
 from spacy.language import DEFAULT_CONFIG_PATH
+from spacy.ml._precomputable_affine import (
+    PrecomputableAffine,
+    _backprop_precomputable_affine_padding,
+)
 from spacy.schemas import ConfigSchemaTraining, TokenPattern, TokenPatternSchema
 from spacy.training.batchers import minibatch_by_words
 from spacy.util import (

spacy/training/example.pyx

@@ -1,5 +1,6 @@
-from collections.abc import Iterable as IterableInstance
 import warnings
+from collections.abc import Iterable as IterableInstance
+
 import numpy
 
 from murmurhash.mrmr cimport hash64