Skip to content

fix: Bigquery dataset create table disposition #4649

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
tokoko merged 6 commits into from
Oct 21, 2024
Merged

fix: Bigquery dataset create table disposition #4649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
59c33a8
fix: adding self to a method which is failing linting in file.py inte…
danbaron63 Oct 18, 2024
41b01e1
fix: added create_table_disposition check when creating a dataset whe…
danbaron63 Oct 18, 2024
f8d65fa
fix: ignoring some mypy linting errors caused by expanding a dict int…
danbaron63 Oct 18, 2024
678f7e7
ignoring typing in auth_permissions_util that would be unreasonable t…
danbaron63 Oct 18, 2024
cdb8539
fixing method declaration that has no self parameter
danbaron63 Oct 18, 2024
c2f3a74
made xdist_group methods static
danbaron63 Oct 18, 2024
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
9 changes: 8 additions & 1 deletion sdk/python/feast/infra/offline_stores/bigquery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ def get_historical_features(
dataset_project,
config.offline_store.dataset,
config.offline_store.location,
config.offline_store.table_create_disposition,
)

entity_schema = _get_entity_schema(
Expand Down Expand Up @@ -670,6 +671,7 @@ def _get_table_reference_for_new_entity(
dataset_project: str,
dataset_name: str,
dataset_location: Optional[str],
table_create_disposition: str,
) -> str:
"""Gets the table_id for the new entity to be uploaded."""

Expand All @@ -679,8 +681,13 @@ def _get_table_reference_for_new_entity(

try:
client.get_dataset(dataset.reference)
except NotFound:
except NotFound as nfe:
# Only create the dataset if it does not exist
if table_create_disposition == "CREATE_NEVER":
raise ValueError(
f"Dataset {dataset_project}.{dataset_name} does not exist "
f"and table_create_disposition is set to {table_create_disposition}."
) from nfe
client.create_dataset(dataset, exists_ok=True)

table_name = offline_utils.get_temp_entity_table_name()
Expand Down
4 changes: 2 additions & 2 deletions sdk/python/tests/integration/feature_repos/repo_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,9 +575,9 @@ def construct_test_environment(
}

if not isinstance(offline_creator, RemoteOfflineOidcAuthStoreDataSourceCreator):
environment = Environment(**environment_params)
environment = Environment(**environment_params) # type: ignore
else:
environment = OfflineServerPermissionsEnvironment(**environment_params)
environment = OfflineServerPermissionsEnvironment(**environment_params) # type: ignore
return environment


Expand Down
1 change: 1 addition & 0 deletions sdk/python/tests/integration/feature_repos/universal/data_source_creator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@ def create_logged_features_destination(self) -> LoggingDestination:
def teardown(self):
raise NotImplementedError

@staticmethod
def xdist_groups() -> list[str]:
return []
9 changes: 5 additions & 4 deletions sdk/python/tests/integration/feature_repos/universal/data_sources/file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ def __init__(self, project_name: str, *args, **kwargs):
self.server_port: int = 0
self.proc = None

@staticmethod
def xdist_groups() -> list[str]:
return ["keycloak"]

Expand All @@ -464,10 +465,10 @@ def setup(self, registry: RegistryConfig):
entity_key_serialization_version=2,
)

repo_path = Path(tempfile.mkdtemp())
with open(repo_path / "feature_store.yaml", "w") as outfile:
repo_base_path = Path(tempfile.mkdtemp())
with open(repo_base_path / "feature_store.yaml", "w") as outfile:
yaml.dump(config.model_dump(by_alias=True), outfile)
repo_path = str(repo_path.resolve())
repo_path = str(repo_base_path.resolve())

include_auth_config(
file_path=f"{repo_path}/feature_store.yaml", auth_config=self.auth_config
Expand All @@ -486,7 +487,7 @@ def setup(self, registry: RegistryConfig):
]
self.proc = subprocess.Popen(
cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL
)
) # type: ignore

_time_out_sec: int = 60
# Wait for server to start
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/tests/utils/auth_permissions_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def default_store(

fs = FeatureStore(repo_path=repo_path)

fs.apply(permissions)
fs.apply(permissions) # type: ignore

return fs

Expand Down