Skip to content

Commit

Permalink
imports get_args and get_type_hints correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
rudolfix committed Mar 4, 2025
1 parent 76fb59f commit d374a82
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 33 deletions.
4 changes: 3 additions & 1 deletion dlt/common/configuration/specs/base_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
TypeVar,
Literal,
)
from typing_extensions import get_args, get_origin, dataclass_transform
from typing_extensions import dataclass_transform
from functools import wraps

if TYPE_CHECKING:
Expand All @@ -41,6 +41,8 @@
is_optional_type,
is_subclass,
is_union_type,
get_args,
get_origin,
)
from dlt.common.data_types import py_type_to_sc_type
from dlt.common.configuration.exceptions import (
Expand Down
4 changes: 1 addition & 3 deletions dlt/common/configuration/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@
Tuple,
Type,
Sequence,
get_args,
Literal,
get_origin,
)
from collections.abc import Mapping as C_Mapping

import yaml

from dlt.common.json import json
from dlt.common.typing import AnyType, DictStrAny, TAny, is_any_type
from dlt.common.typing import AnyType, DictStrAny, TAny, is_any_type, get_args, get_origin
from dlt.common.data_types import coerce_value, py_type_to_sc_type
from dlt.common.configuration.providers import EnvironProvider
from dlt.common.configuration.exceptions import ConfigValueCannotBeCoercedException, LookupTrace
Expand Down
4 changes: 3 additions & 1 deletion dlt/common/data_types/typing.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from typing import Literal, Set, get_args
from typing import Literal, Set

from dlt.common.typing import get_args


TDataType = Literal[
Expand Down
3 changes: 1 addition & 2 deletions dlt/common/destination/capabilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
Set,
Protocol,
Type,
get_args,
)
from dlt.common.data_types import TDataType
from dlt.common.exceptions import TerminalValueError
from dlt.common.normalizers.typing import TNamingConventionReferenceArg
from dlt.common.typing import TLoaderFileFormat
from dlt.common.typing import TLoaderFileFormat, get_args
from dlt.common.configuration.utils import serialize_value
from dlt.common.configuration import configspec
from dlt.common.configuration.specs import ContainerInjectableContext
Expand Down
9 changes: 5 additions & 4 deletions dlt/common/libs/pydantic.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from __future__ import annotations as _annotations
import inspect
from copy import copy
from typing import (
Dict,
Expand All @@ -9,18 +8,20 @@
List,
Type,
Union,
TypeVar,
Any,
)
from typing_extensions import Annotated, get_args, get_origin

from dlt.common.typing import TypedDict
from dlt.common.data_types import py_type_to_sc_type
from dlt.common.exceptions import MissingDependencyException
from dlt.common.schema import DataValidationError
from dlt.common.schema.typing import TSchemaEvolutionMode, TTableSchemaColumns
from dlt.common.normalizers.naming.snake_case import NamingConvention as SnakeCaseNamingConvention
from dlt.common.typing import (
TypedDict,
Annotated,
get_args,
get_origin,
TypeVar,
TDataItem,
TDataItems,
extract_union_types,
Expand Down
11 changes: 8 additions & 3 deletions dlt/common/schema/typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,19 @@
Type,
NewType,
Union,
get_args,
)
from typing_extensions import Never

from dlt.common.typing import TypedDict
from dlt.common.data_types import TDataType
from dlt.common.normalizers.typing import TNormalizersConfig
from dlt.common.typing import TSortOrder, TAnyDateTime, TLoaderFileFormat, TColumnNames
from dlt.common.typing import (
TSortOrder,
TAnyDateTime,
TLoaderFileFormat,
TColumnNames,
TypedDict,
get_args,
)

try:
from pydantic import BaseModel as _PydanticBaseModel
Expand Down
4 changes: 2 additions & 2 deletions dlt/common/storages/configuration.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
import pathlib
from typing import Any, Literal, Optional, Type, get_args, ClassVar, Dict, Union
from typing import Any, Literal, Optional, Type, ClassVar, Dict, Union
from urllib.parse import urlparse, unquote, urlunparse

from dlt.common.configuration import configspec, resolve_type
Expand All @@ -15,7 +15,7 @@
SFTPCredentials,
)
from dlt.common.exceptions import TerminalValueError
from dlt.common.typing import DictStrAny
from dlt.common.typing import DictStrAny, get_args
from dlt.common.utils import digest128


Expand Down
4 changes: 1 addition & 3 deletions dlt/common/storages/load_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@
Optional,
Sequence,
Set,
get_args,
cast,
Any,
Tuple,
)
from typing_extensions import NotRequired

from dlt.common.typing import TypedDict
from dlt.common.typing import TypedDict, get_args, DictStrAny, SupportsHumanize
from dlt.common.pendulum import pendulum
from dlt.common.json import json
from dlt.common.configuration import configspec
Expand All @@ -43,7 +42,6 @@
LoadPackageNotFound,
CurrentLoadPackageStateNotAvailable,
)
from dlt.common.typing import DictStrAny, SupportsHumanize
from dlt.common.utils import flatten_list_or_items
from dlt.common.versioned_state import (
generate_state_version_hash,
Expand Down
9 changes: 5 additions & 4 deletions dlt/common/typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
import inspect
import os
from re import Pattern as _REPattern
import sys
from types import FunctionType
from typing import (
ForwardRef,
Callable,
ClassVar,
Dict,
Expand All @@ -19,8 +17,6 @@
Optional,
Tuple,
Type,
TypeVar,
Generic,
Protocol,
TYPE_CHECKING,
Union,
Expand All @@ -33,14 +29,19 @@
)

from typing_extensions import (
ForwardRef,
Annotated,
Never,
ParamSpec,
TypeAlias,
Concatenate,
Unpack,
Self,
Generic,
get_args,
TypeVar,
get_origin,
get_type_hints,
get_origin,
get_original_bases,
)
Expand Down
5 changes: 3 additions & 2 deletions dlt/common/validation.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import functools
import inspect
from typing import Callable, Any, List, Type, get_type_hints
from typing_extensions import get_args
from typing import Callable, Any, List, Type

from dlt.common.exceptions import DictValidationException
from dlt.common.typing import (
Expand All @@ -16,6 +15,8 @@
is_typeddict,
is_list_generic_type,
is_dict_generic_type,
get_args,
get_type_hints,
_TypedDict,
)

Expand Down
4 changes: 3 additions & 1 deletion dlt/destinations/impl/clickhouse/typing.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from typing import Literal, Dict, get_args, Set
from typing import Literal, Dict, Set

from dlt.common.schema import TColumnHint
from dlt.common.typing import get_args


TSecureConnection = Literal[0, 1]
TTableEngineType = Literal[
Expand Down
3 changes: 2 additions & 1 deletion dlt/destinations/impl/synapse/synapse_adapter.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from typing import Any, Literal, Set, get_args, Final, Dict
from typing import Any, Literal, Set, Final, Dict

from dlt.common.typing import get_args
from dlt.extract import DltResource, resource as make_resource
from dlt.extract.items import TTableHintTemplate
from dlt.extract.hints import TResourceHints
Expand Down
4 changes: 2 additions & 2 deletions dlt/destinations/impl/weaviate/weaviate_adapter.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Dict, Any, Literal, Set, get_args
from typing import Dict, Any, Literal, Set

from dlt.common.schema.typing import TTableSchemaColumns
from dlt.common.typing import TColumnNames
from dlt.common.typing import TColumnNames, get_args
from dlt.extract import DltResource, resource as make_resource
from dlt.destinations.utils import get_resource_for_adapter

Expand Down
3 changes: 1 addition & 2 deletions dlt/extract/incremental/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
from datetime import datetime # noqa: I251
from typing import Generic, ClassVar, Any, Optional, Type, Dict, Union, Literal, Tuple

from typing_extensions import get_args

import inspect
from functools import wraps

Expand All @@ -16,6 +14,7 @@
TDataItems,
TFun,
TSortOrder,
get_args,
extract_inner_type,
get_generic_type_argument_from_instance,
is_optional_type,
Expand Down
3 changes: 1 addition & 2 deletions dlt/pipeline/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
Sequence,
Tuple,
cast,
get_type_hints,
ContextManager,
Union,
)
Expand Down Expand Up @@ -45,7 +44,7 @@
)
from dlt.common.schema.utils import normalize_schema_name
from dlt.common.storages.exceptions import LoadPackageNotFound
from dlt.common.typing import ConfigValue, TFun, TSecretStrValue, TColumnNames
from dlt.common.typing import ConfigValue, TFun, TSecretStrValue, TColumnNames, get_type_hints
from dlt.common.runners import pool_runner as runner
from dlt.common.storages import (
LiveSchemaStorage,
Expand Down

0 comments on commit d374a82

Please sign in to comment.