fix up imports

Author: fgregg

dedupe/__init__.py

@@ -13,3 +13,18 @@
     training_data_link,
 )
 from dedupe.serializer import read_training, write_training  # noqa: F401
+
+__all__ = [
+    "Dedupe",
+    "Gazetteer",
+    "RecordLink",
+    "StaticDedupe",
+    "StaticGazetteer",
+    "StaticRecordLink",
+    "canonicalize",
+    "console_label",
+    "training_data_dedupe",
+    "training_data_link",
+    "read_training",
+    "write_training",
+]

dedupe/api.py

@@ -27,14 +27,14 @@
 import dedupe.labeler as labeler
 import dedupe.predicates
 import dedupe.serializer as serializer
-from dedupe._typing import Literal
 
 if TYPE_CHECKING:
     from typing import (
         BinaryIO,
         Collection,
         Generator,
         Iterable,
+        Literal,
         MutableMapping,
         TextIO,
         Union,

dedupe/convenience.py

@@ -7,15 +7,14 @@
 import random
 import sys
 import warnings
-from typing import Iterator, Tuple, overload
+from typing import Iterator, Literal, Tuple, overload
 
 import numpy
 
 import dedupe
 from dedupe._typing import (
     DataInt,
     DataStr,
-    Literal,
     RecordDict,
     RecordDictPair,
     RecordID,

dedupe/core.py

@@ -22,6 +22,7 @@
         Generator,
         Iterable,
         Iterator,
+        Literal,
         Optional,
         Sequence,
         Type,
@@ -35,7 +36,6 @@
         ClosableJoinable,
         Data,
         FeaturizerFunction,
-        Literal,
         MapLike,
         RecordID,
         RecordIDDType,

dedupe/predicates.py

@@ -17,9 +17,9 @@
 from dedupe.predicate_functions import *  # noqa: F401, F403
 
 if TYPE_CHECKING:
-    from typing import AbstractSet, Any, FrozenSet, Iterable, Mapping, Sequence
+    from typing import AbstractSet, Any, FrozenSet, Iterable, Literal, Mapping, Sequence
 
-    from dedupe._typing import Literal, PredicateFunction, RecordDict
+    from dedupe._typing import PredicateFunction, RecordDict
     from dedupe.index import Index
 
 

dedupe/training.py

@@ -13,7 +13,7 @@
 from . import blocking, branch_and_bound
 
 if TYPE_CHECKING:
-    from typing import Iterable, Sequence
+    from typing import Iterable, Literal, Sequence
 
     from ._typing import (
         ComparisonCover,
@@ -23,7 +23,6 @@
         Data,
         DataInt,
         DataStr,
-        Literal,
     )
     from ._typing import RecordDictPairs as TrainingExamples
     from ._typing import RecordID, RecordIDPair

pyproject.toml

@@ -67,6 +67,7 @@ files = ["dedupe", "benchmarks"]
 show_error_codes = true
 ignore_missing_imports = true
 check_untyped_defs = true
+implicit_reexport = false
 
 [tool.pytest.ini_options]
 minversion = "7.1"