update imports

Author: NiklasRosenstein

databind.core/src/databind/core/__init__.py

@@ -3,7 +3,14 @@
 from .context import Context, Direction, Location, format_context_trace
 from .converter import ConversionError, Converter, DelegateToClassmethodConverter, Module, NoMatchingConverter
 from .mapper import ObjectMapper
-from .schema import Schema, convert_dataclass_to_schema, convert_to_schema, convert_typed_dict_to_schema
+from .schema import (
+    Field,
+    Schema,
+    convert_dataclass_to_schema,
+    convert_to_schema,
+    convert_typed_dict_to_schema,
+    get_fields_expanded,
+)
 from .settings import (
     Alias,
     BooleanSetting,
@@ -43,11 +50,13 @@
     "DeserializeAs",
     "Direction",
     "ExtraKeys",
+    "Field",
     "Flattened",
     "format_context_trace",
     "get_annotation_setting",
     "get_class_setting",
     "get_class_settings",
+    "get_fields_expanded",
     "get_highest_setting",
     "Location",
     "Module",

databind.json/src/databind/json/__init__.py

@@ -3,13 +3,11 @@
 import json
 import typing as t
 
+from databind.core import ObjectMapper, Setting, Settings
+
 from databind.json.module import JsonModule
 from databind.json.settings import JsonConverter
 
-if t.TYPE_CHECKING:
-    from databind.core.mapper import ObjectMapper
-    from databind.core.settings import Setting, Settings
-
 __version__ = "4.2.8"
 __all__ = [
     "dump",
@@ -35,10 +33,6 @@
 
 
 def get_object_mapper(settings: "Settings | None" = None) -> "ObjectMapper[t.Any, JsonType]":
-    from databind.core.mapper import ObjectMapper
-
-    from databind.json.module import JsonModule
-
     mapper = ObjectMapper[t.Any, JsonType](settings)
     mapper.module.register(JsonModule())
     return mapper

databind.json/src/databind/json/converters.py

@@ -5,22 +5,26 @@
 import types
 import typing as t
 
-from databind.core.context import Context, Direction
-from databind.core.converter import ConversionError, Converter
-from databind.core.schema import Field, Schema, convert_to_schema, get_fields_expanded
-from databind.core.settings import (
+from databind.core import (
     Alias,
+    Context,
+    ConversionError,
+    Converter,
     DateFormat,
     DeserializeAs,
+    Direction,
     ExtraKeys,
+    Field,
     Precision,
     Remainder,
+    Schema,
     SerializeDefaults,
     Strict,
     Union,
+    convert_to_schema,
     get_annotation_setting,
+    get_fields_expanded,
 )
-from databind.core.utils import T
 from typeapi import (
     AnnotatedTypeHint,
     ClassTypeHint,
@@ -32,6 +36,8 @@
     type_repr,
 )
 
+T = t.TypeVar("T")
+
 
 def _int_lossless(v: float) -> int:
     """Convert *v* to an integer only if the conversion is lossless, otherwise raise an error."""