Typing & Refactoring

pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
 ]
 dependencies = [
     "matplotlib",
-    "numpy",
+    "numpy>=1.20",
 ]
 dynamic = ["version"]
 

src/daft/__init__.py

@@ -2,13 +2,20 @@
 
 from importlib.metadata import version as get_distribution
 
-from . import _core, _exceptions, _utils
-from ._core import PGM, Node, Edge, Plate, Text
-from ._exceptions import SameLocationError
-from ._utils import _rendering_context, _pop_multiple
+from . import exceptions, node, edge, pgm, plate, types, utils
+from .pgm import PGM
+from .node import Node
+from .edge import Edge
+from .plate import Plate, Text
+from .exceptions import SameLocationError
+from .utils import RenderingContext, _pop_multiple
 
 __version__ = get_distribution("daft")
 __all__ = []
-__all__ += _core.__all__
-__all__ += _exceptions.__all__
-__all__ += _utils.__all__
+__all__ += pgm.__all__
+__all__ += node.__all__
+__all__ += edge.__all__
+__all__ += plate.__all__
+__all__ += exceptions.__all__
+__all__ += utils.__all__
+__all__ += types.__all__