Skip to content
This repository has been archived by the owner on May 17, 2024. It is now read-only.

Commit

Permalink
Normalise all imports to fully qualified names
Browse files Browse the repository at this point in the history
  • Loading branch information
nolar committed Sep 28, 2023
1 parent dd8fa1e commit 65754ab
Show file tree
Hide file tree
Showing 70 changed files with 283 additions and 243 deletions.
14 changes: 7 additions & 7 deletions data_diff/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

from data_diff.sqeleton.abcs import DbTime, DbPath

from .tracking import disable_tracking
from .databases import connect
from .diff_tables import Algorithm
from .hashdiff_tables import HashDiffer, DEFAULT_BISECTION_THRESHOLD, DEFAULT_BISECTION_FACTOR
from .joindiff_tables import JoinDiffer, TABLE_WRITE_LIMIT
from .table_segment import TableSegment
from .utils import eval_name_template, Vector
from data_diff.tracking import disable_tracking
from data_diff.databases import connect
from data_diff.diff_tables import Algorithm
from data_diff.hashdiff_tables import HashDiffer, DEFAULT_BISECTION_THRESHOLD, DEFAULT_BISECTION_FACTOR
from data_diff.joindiff_tables import JoinDiffer, TABLE_WRITE_LIMIT
from data_diff.table_segment import TableSegment
from data_diff.utils import eval_name_template, Vector


def connect_to_table(
Expand Down
22 changes: 11 additions & 11 deletions data_diff/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
from data_diff.sqeleton.schema import create_schema
from data_diff.sqeleton.queries.api import current_timestamp

from .dbt import dbt_diff
from .utils import eval_name_template, remove_password_from_url, safezip, match_like, LogStatusHandler
from .diff_tables import Algorithm
from .hashdiff_tables import HashDiffer, DEFAULT_BISECTION_THRESHOLD, DEFAULT_BISECTION_FACTOR
from .joindiff_tables import TABLE_WRITE_LIMIT, JoinDiffer
from .table_segment import TableSegment
from .databases import connect
from .parse_time import parse_time_before, UNITS_STR, ParseError
from .config import apply_config_from_file
from .tracking import disable_tracking, set_entrypoint_name
from .version import __version__
from data_diff.dbt import dbt_diff
from data_diff.utils import eval_name_template, remove_password_from_url, safezip, match_like, LogStatusHandler
from data_diff.diff_tables import Algorithm
from data_diff.hashdiff_tables import HashDiffer, DEFAULT_BISECTION_THRESHOLD, DEFAULT_BISECTION_FACTOR
from data_diff.joindiff_tables import TABLE_WRITE_LIMIT, JoinDiffer
from data_diff.table_segment import TableSegment
from data_diff.databases import connect
from data_diff.parse_time import parse_time_before, UNITS_STR, ParseError
from data_diff.config import apply_config_from_file
from data_diff.tracking import disable_tracking, set_entrypoint_name
from data_diff.version import __version__


COLOR_SCHEME = {
Expand Down
4 changes: 2 additions & 2 deletions data_diff/cloud/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from .datafold_api import DatafoldAPI, TCloudApiDataDiff, TCloudApiOrgMeta
from .data_source import get_or_create_data_source
from data_diff.cloud.datafold_api import DatafoldAPI, TCloudApiDataDiff, TCloudApiOrgMeta
from data_diff.cloud.data_source import get_or_create_data_source
4 changes: 2 additions & 2 deletions data_diff/cloud/data_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
from rich.prompt import Confirm, Prompt, FloatPrompt, IntPrompt, InvalidResponse
from typing_extensions import Literal

from .datafold_api import (
from data_diff.cloud.datafold_api import (
DatafoldAPI,
TCloudApiDataSourceConfigSchema,
TCloudApiDataSource,
TDsConfig,
TestDataSourceStatus,
)
from ..dbt_parser import DbtParser
from data_diff.dbt_parser import DbtParser


UNKNOWN_VALUE = "unknown_value"
Expand Down
3 changes: 1 addition & 2 deletions data_diff/cloud/datafold_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
from typing_extensions import Self

from data_diff.errors import DataDiffCloudDiffFailed, DataDiffCloudDiffTimedOut, DataDiffDatasourceIdNotFoundError

from ..utils import getLogger
from data_diff.utils import getLogger

logger = getLogger(__name__)

Expand Down
28 changes: 14 additions & 14 deletions data_diff/databases/__init__.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
from data_diff.sqeleton.databases import MD5_HEXDIGITS, CHECKSUM_HEXDIGITS, QueryError, ConnectError

from .postgresql import PostgreSQL
from .mysql import MySQL
from .oracle import Oracle
from .snowflake import Snowflake
from .bigquery import BigQuery
from .redshift import Redshift
from .presto import Presto
from .databricks import Databricks
from .trino import Trino
from .clickhouse import Clickhouse
from .vertica import Vertica
from .duckdb import DuckDB
from .mssql import MsSql
from data_diff.databases.postgresql import PostgreSQL
from data_diff.databases.mysql import MySQL
from data_diff.databases.oracle import Oracle
from data_diff.databases.snowflake import Snowflake
from data_diff.databases.bigquery import BigQuery
from data_diff.databases.redshift import Redshift
from data_diff.databases.presto import Presto
from data_diff.databases.databricks import Databricks
from data_diff.databases.trino import Trino
from data_diff.databases.clickhouse import Clickhouse
from data_diff.databases.vertica import Vertica
from data_diff.databases.duckdb import DuckDB
from data_diff.databases.mssql import MsSql

from ._connect import connect
from data_diff.databases._connect import connect
26 changes: 13 additions & 13 deletions data_diff/databases/_connect.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

from data_diff.sqeleton.databases import Connect

from .postgresql import PostgreSQL
from .mysql import MySQL
from .oracle import Oracle
from .snowflake import Snowflake
from .bigquery import BigQuery
from .redshift import Redshift
from .presto import Presto
from .databricks import Databricks
from .trino import Trino
from .clickhouse import Clickhouse
from .vertica import Vertica
from .duckdb import DuckDB
from .mssql import MsSql
from data_diff.databases.postgresql import PostgreSQL
from data_diff.databases.mysql import MySQL
from data_diff.databases.oracle import Oracle
from data_diff.databases.snowflake import Snowflake
from data_diff.databases.bigquery import BigQuery
from data_diff.databases.redshift import Redshift
from data_diff.databases.presto import Presto
from data_diff.databases.databricks import Databricks
from data_diff.databases.trino import Trino
from data_diff.databases.clickhouse import Clickhouse
from data_diff.databases.vertica import Vertica
from data_diff.databases.duckdb import DuckDB
from data_diff.databases.mssql import MsSql


DATABASE_BY_SCHEME = {
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/bigquery.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import bigquery
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(bigquery.Dialect, bigquery.Mixin_MD5, bigquery.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/clickhouse.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import clickhouse
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(clickhouse.Dialect, clickhouse.Mixin_MD5, clickhouse.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/databricks.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import databricks
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(databricks.Dialect, databricks.Mixin_MD5, databricks.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/duckdb.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import duckdb
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(duckdb.Dialect, duckdb.Mixin_MD5, duckdb.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/mssql.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import mssql
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(mssql.Dialect, mssql.Mixin_MD5, mssql.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/mysql.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import mysql
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(mysql.Dialect, mysql.Mixin_MD5, mysql.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/oracle.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import oracle
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(oracle.Dialect, oracle.Mixin_MD5, oracle.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/postgresql.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import postgresql as pg
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class PostgresqlDialect(pg.PostgresqlDialect, pg.Mixin_MD5, pg.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/presto.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import presto
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(presto.Dialect, presto.Mixin_MD5, presto.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/redshift.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import redshift
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(redshift.Dialect, redshift.Mixin_MD5, redshift.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/snowflake.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import snowflake
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(snowflake.Dialect, snowflake.Mixin_MD5, snowflake.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/trino.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import trino
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(trino.Dialect, trino.Mixin_MD5, trino.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
2 changes: 1 addition & 1 deletion data_diff/databases/vertica.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from data_diff.sqeleton.databases import vertica
from .base import DatadiffDialect
from data_diff.databases.base import DatadiffDialect


class Dialect(vertica.Dialect, vertica.Mixin_MD5, vertica.Mixin_NormalizeValue, DatadiffDialect):
Expand Down
14 changes: 7 additions & 7 deletions data_diff/dbt.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
DataDiffNoDatasourceIdError,
)

from . import connect_to_table, diff_tables, Algorithm
from .cloud import DatafoldAPI, TCloudApiDataDiff, TCloudApiOrgMeta
from .dbt_parser import DbtParser, TDatadiffConfig
from .diff_tables import DiffResultWrapper
from .format import jsonify, jsonify_error
from .tracking import (
from data_diff import connect_to_table, diff_tables, Algorithm
from data_diff.cloud import DatafoldAPI, TCloudApiDataDiff, TCloudApiOrgMeta
from data_diff.dbt_parser import DbtParser, TDatadiffConfig
from data_diff.diff_tables import DiffResultWrapper
from data_diff.format import jsonify, jsonify_error
from data_diff.tracking import (
bool_ask_for_email,
bool_notify_about_extension,
create_email_signup_event_json,
Expand All @@ -34,7 +34,7 @@
send_event_json,
is_tracking_enabled,
)
from .utils import (
from data_diff.utils import (
dbt_diff_string_template,
getLogger,
columns_added_template,
Expand Down
4 changes: 2 additions & 2 deletions data_diff/dbt_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from packaging.version import parse as parse_version
from dbt.config.renderer import ProfileRenderer
from .dbt_config_validators import ManifestJsonConfig, RunResultsJsonConfig
from data_diff.dbt_config_validators import ManifestJsonConfig, RunResultsJsonConfig

from data_diff.errors import (
DataDiffDbtBigQueryUnsupportedMethodError,
Expand All @@ -24,7 +24,7 @@
DataDiffSimpleSelectNotFound,
)

from .utils import getLogger, get_from_dict_with_raise
from data_diff.utils import getLogger, get_from_dict_with_raise


logger = getLogger(__name__)
Expand Down
8 changes: 4 additions & 4 deletions data_diff/diff_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@

from data_diff.info_tree import InfoTree, SegmentInfo

from .utils import dbt_diff_string_template, run_as_daemon, safezip, getLogger, truncate_error, Vector
from .thread_utils import ThreadedYielder
from .table_segment import TableSegment, create_mesh_from_points
from .tracking import create_end_event_json, create_start_event_json, send_event_json, is_tracking_enabled
from data_diff.utils import dbt_diff_string_template, run_as_daemon, safezip, getLogger, truncate_error, Vector
from data_diff.thread_utils import ThreadedYielder
from data_diff.table_segment import TableSegment, create_mesh_from_points
from data_diff.tracking import create_end_event_json, create_start_event_json, send_event_json, is_tracking_enabled
from data_diff.sqeleton.abcs import IKey

logger = getLogger(__name__)
Expand Down
10 changes: 5 additions & 5 deletions data_diff/hashdiff_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

from data_diff.sqeleton.abcs import ColType_UUID, NumericType, PrecisionType, StringType, Boolean, JSON

from .info_tree import InfoTree
from .utils import safezip, diffs_are_equiv_jsons
from .thread_utils import ThreadedYielder
from .table_segment import TableSegment
from data_diff.info_tree import InfoTree
from data_diff.utils import safezip, diffs_are_equiv_jsons
from data_diff.thread_utils import ThreadedYielder
from data_diff.table_segment import TableSegment

from .diff_tables import TableDiffer
from data_diff.diff_tables import TableDiffer

BENCHMARK = os.environ.get("BENCHMARK", False)

Expand Down
2 changes: 1 addition & 1 deletion data_diff/info_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from runtype import dataclass

from .table_segment import TableSegment
from data_diff.table_segment import TableSegment


@dataclass(frozen=False)
Expand Down
12 changes: 6 additions & 6 deletions data_diff/joindiff_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
from data_diff.sqeleton.queries.ast_classes import Concat, Count, Expr, Func, Random, TablePath, Code, ITable
from data_diff.sqeleton.queries.extras import NormalizeAsString

from .info_tree import InfoTree
from data_diff.info_tree import InfoTree

from .query_utils import append_to_table, drop_table
from .utils import safezip
from .table_segment import TableSegment
from .diff_tables import TableDiffer, DiffResult
from .thread_utils import ThreadedYielder
from data_diff.query_utils import append_to_table, drop_table
from data_diff.utils import safezip
from data_diff.table_segment import TableSegment
from data_diff.diff_tables import TableDiffer, DiffResult
from data_diff.thread_utils import ThreadedYielder


logger = logging.getLogger("joindiff_tables")
Expand Down
2 changes: 1 addition & 1 deletion data_diff/lexicographic_space.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from random import randint, randrange

from typing import Tuple
from .utils import safezip
from data_diff.utils import safezip

Vector = Tuple[int]
Interval = Tuple[int]
Expand Down
4 changes: 2 additions & 2 deletions data_diff/sqeleton/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from .databases import connect
from .queries import table, this, SKIP, code
from data_diff.sqeleton.databases import connect
from data_diff.sqeleton.queries import table, this, SKIP, code
2 changes: 1 addition & 1 deletion data_diff/sqeleton/__main__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import click
from .repl import repl as repl_main
from data_diff.sqeleton.repl import repl as repl_main


@click.group(no_args_is_help=True)
Expand Down
4 changes: 2 additions & 2 deletions data_diff/sqeleton/abcs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .database_types import (
from data_diff.sqeleton.abcs.database_types import (
AbstractDatabase,
AbstractDialect,
DbKey,
Expand All @@ -12,4 +12,4 @@
Boolean,
JSON,
)
from .compiler import AbstractCompiler, Compilable
from data_diff.sqeleton.abcs.compiler import AbstractCompiler, Compilable
2 changes: 1 addition & 1 deletion data_diff/sqeleton/abcs/database_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from runtype import dataclass
from typing_extensions import Self

from ..utils import ArithAlphanumeric, ArithUUID, Unknown
from data_diff.sqeleton.utils import ArithAlphanumeric, ArithUUID, Unknown


DbPath = Tuple[str, ...]
Expand Down
Loading

0 comments on commit 65754ab

Please sign in to comment.