Skip to content

refactor: remove circular dependencies preventing local doctest runs #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2024
Merged

refactor: remove circular dependencies preventing local doctest runs #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bigframes/bigquery/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
import typing
from typing import Literal, Optional, Union

import bigframes.constants as constants
import bigframes_vendored.constants as constants

import bigframes.core.groupby as groupby
import bigframes.core.sql
import bigframes.ml.utils as utils
Expand Down
8 changes: 0 additions & 8 deletions bigframes/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@

import datetime

import bigframes_vendored.constants

BF_VERSION = bigframes_vendored.constants.BF_VERSION
FEEDBACK_LINK = bigframes_vendored.constants.FEEDBACK_LINK
ABSTRACT_METHOD_ERROR_MESSAGE = (
bigframes_vendored.constants.ABSTRACT_METHOD_ERROR_MESSAGE
)

DEFAULT_EXPIRATION = datetime.timedelta(days=7)

# https://cloud.google.com/bigquery/docs/locations
Expand Down
5 changes: 3 additions & 2 deletions bigframes/core/block_transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
import typing
from typing import Sequence

import bigframes_vendored.constants as constants
import pandas as pd

import bigframes.constants as constants
import bigframes.constants
import bigframes.core as core
import bigframes.core.blocks as blocks
import bigframes.core.expression as ex
Expand Down Expand Up @@ -117,7 +118,7 @@ def quantile(
)
quantile_cols = []
labels = []
if len(columns) * len(qs) > constants.MAX_COLUMNS:
if len(columns) * len(qs) > bigframes.constants.MAX_COLUMNS:
raise NotImplementedError("Too many aggregates requested.")
for col in columns:
for q in qs:
Expand Down
2 changes: 1 addition & 1 deletion bigframes/core/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
from typing import Iterable, List, Literal, Mapping, Optional, Sequence, Tuple, Union
import warnings

import bigframes_vendored.constants as constants
import google.cloud.bigquery as bigquery
import pandas as pd
import pyarrow as pa

import bigframes._config.sampling_options as sampling_options
import bigframes.constants
import bigframes.constants as constants
import bigframes.core as core
import bigframes.core.compile.googlesql as googlesql
import bigframes.core.expression as ex
Expand Down
2 changes: 1 addition & 1 deletion bigframes/core/compile/aggregate_compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
import typing
from typing import cast, Optional

import bigframes_vendored.constants as constants
import bigframes_vendored.ibis.expr.operations as vendored_ibis_ops
import ibis
import ibis.expr.datatypes as ibis_dtypes
import ibis.expr.types as ibis_types
import pandas as pd

import bigframes.constants as constants
import bigframes.core.compile.ibis_types as compile_ibis_types
import bigframes.core.compile.scalar_op_compiler as scalar_compilers
import bigframes.core.expression as ex
Expand Down
2 changes: 1 addition & 1 deletion bigframes/core/compile/ibis_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from typing import Any, cast, Dict, Iterable, Optional, Tuple, Union
import warnings

import bigframes_vendored.constants as constants
import bigframes_vendored.ibis.backends.bigquery.datatypes as third_party_ibis_bqtypes
import bigframes_vendored.ibis.expr.operations as vendored_ibis_ops
import geopandas as gpd # type: ignore
Expand All @@ -29,7 +30,6 @@
import pandas as pd
import pyarrow as pa

import bigframes.constants as constants
import bigframes.dtypes

# Type hints for Ibis data types supported by BigQuery DataFrame
Expand Down
2 changes: 1 addition & 1 deletion bigframes/core/compile/scalar_op_compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import functools
import typing

import bigframes_vendored.constants as constants
import bigframes_vendored.ibis.expr.operations as vendored_ibis_ops
import ibis
import ibis.common.exceptions
Expand All @@ -26,7 +27,6 @@
import numpy as np
import pandas as pd

import bigframes.constants as constants
import bigframes.core.compile.ibis_types
import bigframes.core.expression as ex
import bigframes.dtypes
Expand Down
2 changes: 1 addition & 1 deletion bigframes/core/groupby/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
import typing
from typing import Sequence, Union

import bigframes_vendored.constants as constants
import bigframes_vendored.pandas.core.groupby as vendored_pandas_groupby
import pandas as pd

import bigframes.constants as constants
from bigframes.core import log_adapter
import bigframes.core as core
import bigframes.core.block_transforms as block_ops
Expand Down
2 changes: 1 addition & 1 deletion bigframes/core/indexers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
import typing
from typing import Tuple, Union

import bigframes_vendored.constants as constants
import ibis
import pandas as pd

import bigframes.constants as constants
import bigframes.core.blocks
import bigframes.core.expression as ex
import bigframes.core.guid as guid
Expand Down
2 changes: 1 addition & 1 deletion bigframes/core/indexes/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
import typing
from typing import Hashable, Optional, Sequence, Union

import bigframes_vendored.constants as constants
import bigframes_vendored.pandas.core.indexes.base as vendored_pandas_index
import google.cloud.bigquery as bigquery
import numpy as np
import pandas

import bigframes.constants as constants
import bigframes.core.block_transforms as block_ops
import bigframes.core.blocks as blocks
import bigframes.core.expression as ex
Expand Down
2 changes: 1 addition & 1 deletion bigframes/core/reshape/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import typing
from typing import Iterable, Literal, Optional, Union

import bigframes_vendored.constants as constants
import pandas as pd

import bigframes.constants as constants
import bigframes.core.expression as ex
import bigframes.core.ordering as order
import bigframes.core.utils as utils
Expand Down
2 changes: 1 addition & 1 deletion bigframes/core/tools/datetimes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
from datetime import datetime
from typing import Optional, Union

import bigframes_vendored.constants as constants
import bigframes_vendored.pandas.core.tools.datetimes as vendored_pandas_datetimes
import pandas as pd

import bigframes.constants as constants
import bigframes.dataframe
import bigframes.dtypes
import bigframes.operations as ops
Expand Down
7 changes: 4 additions & 3 deletions bigframes/core/validations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
import functools
from typing import Optional, Protocol, TYPE_CHECKING, Union

import bigframes.constants
import bigframes_vendored.constants as constants

import bigframes.exceptions

if TYPE_CHECKING:
Expand Down Expand Up @@ -72,9 +73,9 @@ def enforce_ordered(
if not session._allows_ambiguity:
suggestion_substr = suggestion + " " if suggestion else ""
raise bigframes.exceptions.OrderRequiredError(
f"Op {opname} not supported when strict ordering is disabled. {suggestion_substr}{bigframes.constants.FEEDBACK_LINK}"
f"Op {opname} not supported when strict ordering is disabled. {suggestion_substr}{constants.FEEDBACK_LINK}"
)
if not object._block.explicitly_ordered:
raise bigframes.exceptions.OrderRequiredError(
f"Op {opname} requires an ordering. Use .sort_values or .sort_index to provide an ordering. {bigframes.constants.FEEDBACK_LINK}"
f"Op {opname} requires an ordering. Use .sort_values or .sort_index to provide an ordering. {constants.FEEDBACK_LINK}"
)
4 changes: 2 additions & 2 deletions bigframes/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
)
import warnings

import bigframes_vendored.constants as constants
import bigframes_vendored.pandas.core.frame as vendored_pandas_frame
import bigframes_vendored.pandas.pandas._typing as vendored_pandas_typing
import google.api_core.exceptions
Expand All @@ -49,7 +50,6 @@
import bigframes
import bigframes._config.display_options as display_options
import bigframes.constants
import bigframes.constants as constants
import bigframes.core
from bigframes.core import log_adapter
import bigframes.core.block_transforms as block_ops
Expand Down Expand Up @@ -3106,7 +3106,7 @@ def to_gbq(
self._session.bqclient,
temp_table_ref,
datetime.datetime.now(datetime.timezone.utc)
+ constants.DEFAULT_EXPIRATION,
+ bigframes.constants.DEFAULT_EXPIRATION,
)

if len(labels) != 0:
Expand Down
3 changes: 1 addition & 2 deletions bigframes/dtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@
import typing
from typing import Dict, Literal, Union

import bigframes_vendored.constants as constants
import geopandas as gpd # type: ignore
import google.cloud.bigquery
import numpy as np
import pandas as pd
import pyarrow as pa

import bigframes.constants as constants

# Type hints for Pandas dtypes supported by BigQuery DataFrame
Dtype = Union[
pd.BooleanDtype,
Expand Down
3 changes: 1 addition & 2 deletions bigframes/formatting_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@
import random
from typing import Any, Optional, Union

import bigframes_vendored.constants as constants
import google.api_core.exceptions as api_core_exceptions
import google.cloud.bigquery as bigquery
import humanize
import IPython
import IPython.display as display
import ipywidgets as widgets

import bigframes.constants as constants

GenericJob = Union[
bigquery.LoadJob, bigquery.ExtractJob, bigquery.QueryJob, bigquery.CopyJob
]
Expand Down
2 changes: 1 addition & 1 deletion bigframes/functions/_remote_function_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
import tempfile
from typing import cast, Tuple, TYPE_CHECKING

from bigframes_vendored import constants
import requests

from bigframes import constants
import bigframes.functions.remote_function_template

if TYPE_CHECKING:
Expand Down
3 changes: 2 additions & 1 deletion bigframes/functions/_remote_function_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from typing import Any, cast, Dict, Mapping, Optional, Sequence, TYPE_CHECKING, Union
import warnings

import bigframes_vendored.constants as constants
import cloudpickle
import google.api_core.exceptions
from google.cloud import (
Expand All @@ -31,7 +32,7 @@
resourcemanager_v3,
)

from bigframes import clients, constants
from bigframes import clients

if TYPE_CHECKING:
from bigframes.session import Session
Expand Down
2 changes: 1 addition & 1 deletion bigframes/functions/remote_function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
if TYPE_CHECKING:
from bigframes.session import Session

import bigframes_vendored.constants as constants
import google.api_core.exceptions
import google.api_core.retry
from google.cloud import bigquery
import google.iam.v1

import bigframes.constants as constants
import bigframes.core.compile.ibis_types
import bigframes.dtypes
import bigframes.functions.remote_function_template
Expand Down
2 changes: 1 addition & 1 deletion bigframes/ml/compose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import typing
from typing import cast, Iterable, List, Optional, Set, Tuple, Union

from bigframes_vendored import constants
import bigframes_vendored.sklearn.compose._column_transformer
from google.cloud import bigquery

from bigframes import constants
from bigframes.core import log_adapter
from bigframes.ml import base, core, globals, impute, preprocessing, utils
import bigframes.pandas as bpd
Expand Down
2 changes: 1 addition & 1 deletion bigframes/ml/linear_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

from typing import Dict, List, Literal, Optional, Union

import bigframes_vendored.constants as constants
import bigframes_vendored.sklearn.linear_model._base
import bigframes_vendored.sklearn.linear_model._logistic
from google.cloud import bigquery

import bigframes
import bigframes.constants as constants
from bigframes.core import log_adapter
from bigframes.ml import base, core, globals, utils
import bigframes.pandas as bpd
Expand Down
3 changes: 2 additions & 1 deletion bigframes/ml/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
from typing import cast, Literal, Optional, Union
import warnings

import bigframes_vendored.constants as constants
from google.cloud import bigquery

import bigframes
from bigframes import clients, constants
from bigframes import clients
from bigframes.core import blocks, log_adapter
from bigframes.ml import base, core, globals, utils
import bigframes.pandas as bpd
Expand Down
2 changes: 1 addition & 1 deletion bigframes/ml/loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
from types import MappingProxyType
from typing import Union

import bigframes_vendored.constants as constants
from google.cloud import bigquery

import bigframes
import bigframes.constants as constants
from bigframes.ml import (
cluster,
compose,
Expand Down
2 changes: 1 addition & 1 deletion bigframes/ml/metrics/_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
import typing
from typing import Tuple, Union

import bigframes_vendored.constants as constants
import bigframes_vendored.sklearn.metrics._classification as vendored_metrics_classification
import bigframes_vendored.sklearn.metrics._ranking as vendored_metrics_ranking
import bigframes_vendored.sklearn.metrics._regression as vendored_metrics_regression
import numpy as np
import pandas as pd
import sklearn.metrics as sklearn_metrics # type: ignore

import bigframes.constants as constants
from bigframes.ml import utils
import bigframes.pandas as bpd

Expand Down
2 changes: 1 addition & 1 deletion bigframes/ml/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

from typing import List, Optional, Tuple, Union

import bigframes_vendored.constants as constants
import bigframes_vendored.sklearn.pipeline
from google.cloud import bigquery

import bigframes
import bigframes.constants as constants
from bigframes.core import log_adapter
from bigframes.ml import (
base,
Expand Down
3 changes: 1 addition & 2 deletions bigframes/ml/sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@

from typing import Iterable, Literal, Mapping, Optional, Union

import bigframes_vendored.constants as constants
import google.cloud.bigquery

import bigframes.constants as constants


# TODO: Add proper escaping logic from core/compile module
class BaseSqlGenerator:
Expand Down
2 changes: 1 addition & 1 deletion bigframes/ml/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import typing
from typing import Any, Iterable, Literal, Mapping, Optional, Union

import bigframes_vendored.constants as constants
from google.cloud import bigquery

import bigframes.constants as constants
from bigframes.core import blocks
import bigframes.pandas as bpd

Expand Down
Loading