refactor: Use canonical imports

src/griffe/__init__.py

@@ -10,8 +10,11 @@
 from griffe.agents.nodes import ObjectNode
 from griffe.dataclasses import Attribute, Class, Docstring, Function, Module, Object
 from griffe.diff import find_breaking_changes
-from griffe.docstrings.parsers import Parser, parse_google, parse_numpy, parse_sphinx
-from griffe.extensions import Extension, load_extensions
+from griffe.docstrings.google import parse as parse_google
+from griffe.docstrings.numpy import parse as parse_numpy
+from griffe.docstrings.sphinx import parse as parse_sphinx
+from griffe.enumerations import Parser
+from griffe.extensions.base import Extension, load_extensions
 from griffe.git import load_git
 from griffe.importer import dynamic_import
 from griffe.loader import load

src/griffe/agents/inspector.py

@@ -28,26 +28,18 @@
 from inspect import signature as getsignature
 from typing import TYPE_CHECKING, Any, Sequence
 
-from griffe.agents.nodes import ObjectKind, ObjectNode, safe_get_annotation
+from griffe.agents.nodes import ObjectNode
 from griffe.collections import LinesCollection, ModulesCollection
-from griffe.dataclasses import (
-    Alias,
-    Attribute,
-    Class,
-    Docstring,
-    Function,
-    Module,
-    Parameter,
-    ParameterKind,
-    Parameters,
-)
-from griffe.extensions import Extensions
+from griffe.dataclasses import Alias, Attribute, Class, Docstring, Function, Module, Parameter, Parameters
+from griffe.enumerations import ObjectKind, ParameterKind
+from griffe.expressions import safe_get_annotation
+from griffe.extensions.base import Extensions
 from griffe.importer import dynamic_import
 
 if TYPE_CHECKING:
     from pathlib import Path
 
-    from griffe.docstrings.parsers import Parser
+    from griffe.enumerations import Parser
     from griffe.expressions import Expr
 
 

src/griffe/agents/nodes/__init__.py

@@ -18,8 +18,9 @@
 from griffe.agents.nodes._imports import relative_to_absolute
 from griffe.agents.nodes._names import get_instance_names, get_name, get_names
 from griffe.agents.nodes._parameters import get_call_keyword_arguments
-from griffe.agents.nodes._runtime import ObjectKind, ObjectNode
+from griffe.agents.nodes._runtime import ObjectNode
 from griffe.agents.nodes._values import get_value, safe_get_value
+from griffe.enumerations import ObjectKind
 from griffe.expressions import (
     get_annotation,
     get_base_class,

src/griffe/agents/visitor.py

@@ -22,32 +22,27 @@
     get_names,
     relative_to_absolute,
     safe_get__all__,
+)
+from griffe.collections import LinesCollection, ModulesCollection
+from griffe.dataclasses import Alias, Attribute, Class, Decorator, Docstring, Function, Module, Parameter, Parameters
+from griffe.enumerations import Kind, ParameterKind
+from griffe.exceptions import AliasResolutionError, CyclicAliasError, LastNodeError
+from griffe.expressions import (
+    Expr,
+    ExprAttribute,
+    ExprCall,
+    ExprName,
     safe_get_annotation,
     safe_get_base_class,
     safe_get_condition,
+    safe_get_expression,
 )
-from griffe.collections import LinesCollection, ModulesCollection
-from griffe.dataclasses import (
-    Alias,
-    Attribute,
-    Class,
-    Decorator,
-    Docstring,
-    Function,
-    Kind,
-    Module,
-    Parameter,
-    ParameterKind,
-    Parameters,
-)
-from griffe.exceptions import AliasResolutionError, CyclicAliasError, LastNodeError
-from griffe.expressions import Expr, safe_get_expression
-from griffe.extensions import Extensions
+from griffe.extensions.base import Extensions
 
 if TYPE_CHECKING:
     from pathlib import Path
 
-    from griffe.docstrings.parsers import Parser
+    from griffe.enumerations import Parser
 
 
 builtin_decorators = {

src/griffe/cli.py

@@ -25,9 +25,9 @@
 import colorama
 
 from griffe import debug
-from griffe.diff import ExplanationStyle, find_breaking_changes
-from griffe.docstrings.parsers import Parser
+from griffe.diff import find_breaking_changes
 from griffe.encoders import JSONEncoder
+from griffe.enumerations import ExplanationStyle, Parser
 from griffe.exceptions import ExtensionError, GitError
 from griffe.extensions.base import load_extensions
 from griffe.git import _get_latest_tag, _get_repo_root, load_git
@@ -36,7 +36,7 @@
 from griffe.stats import _format_stats
 
 if TYPE_CHECKING:
-    from griffe.extensions import Extensions, ExtensionType
+    from griffe.extensions.base import Extensions, ExtensionType
 
 
 DEFAULT_LOG_LEVEL = os.getenv("GRIFFE_LOG_LEVEL", "INFO").upper()

src/griffe/dataclasses.py

@@ -15,8 +15,8 @@
 from typing import TYPE_CHECKING, Any, Callable, Literal, Sequence, Union, cast
 
 from griffe.c3linear import c3linear_merge
-from griffe.docstrings.parsers import Parser, parse
-from griffe.enumerations import Kind, ParameterKind
+from griffe.docstrings.parsers import parse
+from griffe.enumerations import Kind, ParameterKind, Parser
 from griffe.exceptions import AliasResolutionError, BuiltinModuleError, CyclicAliasError, NameResolutionError
 from griffe.expressions import ExprCall, ExprName
 from griffe.logger import get_logger

src/griffe/diff.py

@@ -8,8 +8,8 @@
 
 from colorama import Fore, Style
 
-from griffe.dataclasses import Alias, Attribute, Class, Function, Object, ParameterKind
-from griffe.enumerations import BreakageKind, ExplanationStyle
+from griffe.dataclasses import Alias, Attribute, Class, Function, Object
+from griffe.enumerations import BreakageKind, ExplanationStyle, ParameterKind
 from griffe.exceptions import AliasResolutionError
 from griffe.git import WORKTREE_PREFIX
 from griffe.logger import get_logger

src/griffe/docstrings/__init__.py

@@ -1,5 +1,6 @@
 """This module exposes objects related to docstrings."""
 
-from griffe.docstrings.parsers import Parser, parse, parsers
+from griffe.docstrings.parsers import parse, parsers
+from griffe.enumerations import Parser
 
 __all__ = ["Parser", "parse", "parsers"]

src/griffe/docstrings/google.py

@@ -22,7 +22,6 @@
     DocstringSectionDeprecated,
     DocstringSectionExamples,
     DocstringSectionFunctions,
-    DocstringSectionKind,
     DocstringSectionModules,
     DocstringSectionOtherParameters,
     DocstringSectionParameters,
@@ -36,6 +35,7 @@
     DocstringYield,
 )
 from griffe.docstrings.utils import parse_annotation, warning
+from griffe.enumerations import DocstringSectionKind
 from griffe.expressions import ExprName
 from griffe.logger import LogLevel
 

src/griffe/docstrings/numpy.py

@@ -40,7 +40,6 @@
     DocstringSectionDeprecated,
     DocstringSectionExamples,
     DocstringSectionFunctions,
-    DocstringSectionKind,
     DocstringSectionModules,
     DocstringSectionOtherParameters,
     DocstringSectionParameters,
@@ -54,6 +53,7 @@
     DocstringYield,
 )
 from griffe.docstrings.utils import parse_annotation, warning
+from griffe.enumerations import DocstringSectionKind
 from griffe.expressions import ExprName
 from griffe.logger import LogLevel
 

src/griffe/docstrings/utils.py

@@ -6,8 +6,8 @@
 from contextlib import suppress
 from typing import TYPE_CHECKING, Protocol
 
-from griffe.agents.nodes import safe_get_annotation
 from griffe.exceptions import BuiltinModuleError
+from griffe.expressions import safe_get_annotation
 from griffe.logger import LogLevel, get_logger
 
 if TYPE_CHECKING:

src/griffe/encoders.py

@@ -20,19 +20,17 @@
     Decorator,
     Docstring,
     Function,
-    Kind,
     Module,
     Object,
     Parameter,
-    ParameterKind,
     Parameters,
 )
-from griffe.docstrings.dataclasses import DocstringSectionKind
+from griffe.enumerations import DocstringSectionKind, Kind, ParameterKind
 
 if TYPE_CHECKING:
     from enum import Enum
 
-    from griffe.docstrings.parsers import Parser
+    from griffe.enumerations import Parser
 
 
 def _enum_value(obj: Enum) -> str | int:

src/griffe/extensions/__init__.py

@@ -1,12 +1,12 @@
 """This module is the public interface to import elements from the base."""
 
+from griffe.enumerations import When
 from griffe.extensions.base import (
     Extension,
     Extensions,
     ExtensionType,
     InspectorExtension,
     VisitorExtension,
-    When,
     load_extensions,
 )
 

src/griffe/extensions/hybrid.py

@@ -6,8 +6,9 @@
 from typing import TYPE_CHECKING, Any, Pattern, Sequence
 
 from griffe.agents.nodes import ObjectNode
+from griffe.enumerations import When
 from griffe.exceptions import ExtensionError
-from griffe.extensions.base import InspectorExtension, VisitorExtension, When, _load_extension
+from griffe.extensions.base import InspectorExtension, VisitorExtension, _load_extension
 from griffe.importer import dynamic_import
 from griffe.logger import get_logger
 

src/griffe/git.py

@@ -24,8 +24,8 @@
 if TYPE_CHECKING:
     from griffe.collections import LinesCollection, ModulesCollection
     from griffe.dataclasses import Object
-    from griffe.docstrings.parsers import Parser
-    from griffe.extensions import Extensions
+    from griffe.enumerations import Parser
+    from griffe.extensions.base import Extensions
 
 
 WORKTREE_PREFIX = "griffe-worktree-"

src/griffe/loader.py

@@ -21,10 +21,11 @@
 from griffe.agents.inspector import inspect
 from griffe.agents.visitor import visit
 from griffe.collections import LinesCollection, ModulesCollection
-from griffe.dataclasses import Alias, Kind, Module, Object
+from griffe.dataclasses import Alias, Module, Object
+from griffe.enumerations import Kind
 from griffe.exceptions import AliasResolutionError, CyclicAliasError, LoadingError, UnimportableModuleError
 from griffe.expressions import ExprName
-from griffe.extensions import Extensions
+from griffe.extensions.base import Extensions
 from griffe.finder import ModuleFinder, NamespacePackage, Package
 from griffe.logger import get_logger
 from griffe.merger import merge_stubs
@@ -33,7 +34,7 @@
 if TYPE_CHECKING:
     from pathlib import Path
 
-    from griffe.docstrings.parsers import Parser
+    from griffe.enumerations import Parser
 
 logger = get_logger(__name__)
 _builtin_modules: set[str] = set(sys.builtin_module_names)

src/griffe/tests.py

@@ -18,8 +18,8 @@
 
 if TYPE_CHECKING:
     from griffe.collections import LinesCollection, ModulesCollection
-    from griffe.docstrings.parsers import Parser
-    from griffe.extensions import Extensions
+    from griffe.enumerations import Parser
+    from griffe.extensions.base import Extensions
 
 TMPDIR_PREFIX = "griffe_"