Skip to content
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.

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

feat(ingest/gx): support gx version 0.18.0 #11823

Merged
merged 3 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/gx-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ jobs:
extraPythonRequirement: "great-expectations~=0.16.0 numpy~=1.26.0"
- python-version: "3.11"
extraPythonRequirement: "great-expectations~=0.17.0"
- python-version: "3.11"
extraPythonRequirement: "great-expectations~=0.18.0"
fail-fast: false
steps:
- name: Set up JDK 17
Expand Down
2 changes: 1 addition & 1 deletion metadata-ingestion-modules/gx-plugin/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def get_long_description():
# GE added handling for higher version of jinja2 in version 0.15.12
# https://github.com/great-expectations/great_expectations/pull/5382/files
# TODO: support GX 0.18.0
"great-expectations>=0.15.12, <0.18.0",
"great-expectations>=0.15.12, <1.0.0",
# datahub does not depend on traitlets directly but great expectations does.
# https://github.com/ipython/traitlets/issues/741
"traitlets<5.2.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union

import datahub.emitter.mce_builder as builder
import packaging.version
from datahub.cli.env_utils import get_boolean_env_variable
from datahub.emitter.mcp import MetadataChangeProposalWrapper
from datahub.emitter.rest_emitter import DatahubRestEmitter
Expand Down Expand Up @@ -59,6 +60,16 @@
from sqlalchemy.engine.base import Connection, Engine
from sqlalchemy.engine.url import make_url

# TODO: move this and version check used in tests to some common module
try:
from great_expectations import __version__ as GX_VERSION # type: ignore

has_name_positional_arg = packaging.version.parse(
GX_VERSION
) >= packaging.version.Version("0.18.0")
except Exception:
has_name_positional_arg = False

if TYPE_CHECKING:
from great_expectations.data_context.types.resource_identifiers import (
GXCloudIdentifier,
Expand All @@ -78,6 +89,8 @@ class DataHubValidationAction(ValidationAction):
def __init__(
self,
data_context: AbstractDataContext,
# this would capture `name` positional arg added in GX 0.18.0
*args: Union[str, Any],
server_url: str,
env: str = builder.DEFAULT_ENV,
platform_alias: Optional[str] = None,
Expand All @@ -94,7 +107,12 @@ def __init__(
name: str = "DataHubValidationAction",
):

super().__init__(data_context)
if has_name_positional_arg:
if len(args) >= 1 and isinstance(args[0], str):
name = args[0]
super().__init__(data_context, name)
else:
super().__init__(data_context)
self.server_url = server_url
self.env = env
self.platform_alias = platform_alias
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
)
from great_expectations.core.id_dict import IDDict
from great_expectations.core.run_identifier import RunIdentifier
from great_expectations.data_context import DataContext, FileDataContext
from great_expectations.data_context import FileDataContext
from great_expectations.data_context.types.resource_identifiers import (
ExpectationSuiteIdentifier,
ValidationResultIdentifier,
Expand All @@ -52,7 +52,7 @@


@pytest.fixture(scope="function")
def ge_data_context(tmp_path: str) -> DataContext:
def ge_data_context(tmp_path: str) -> FileDataContext:
return FileDataContext.create(tmp_path)


Expand Down Expand Up @@ -233,7 +233,7 @@ def ge_validation_result_suite_id_pandas() -> ValidationResultIdentifier:
@mock.patch("datahub.emitter.rest_emitter.DatahubRestEmitter.emit_mcp", autospec=True)
def test_DataHubValidationAction_sqlalchemy(
mock_emitter: mock.MagicMock,
ge_data_context: DataContext,
ge_data_context: FileDataContext,
ge_validator_sqlalchemy: Validator,
ge_validation_result_suite: ExpectationSuiteValidationResult,
ge_validation_result_suite_id: ValidationResultIdentifier,
Expand Down Expand Up @@ -337,7 +337,7 @@ def test_DataHubValidationAction_sqlalchemy(
@mock.patch("datahub.emitter.rest_emitter.DatahubRestEmitter.emit_mcp", autospec=True)
def test_DataHubValidationAction_pandas(
mock_emitter: mock.MagicMock,
ge_data_context: DataContext,
ge_data_context: FileDataContext,
ge_validator_pandas: Validator,
ge_validation_result_suite_pandas: ExpectationSuiteValidationResult,
ge_validation_result_suite_id_pandas: ValidationResultIdentifier,
Expand Down Expand Up @@ -399,7 +399,7 @@ def test_DataHubValidationAction_pandas(


def test_DataHubValidationAction_graceful_failure(
ge_data_context: DataContext,
ge_data_context: FileDataContext,
ge_validator_sqlalchemy: Validator,
ge_validation_result_suite: ExpectationSuiteValidationResult,
ge_validation_result_suite_id: ValidationResultIdentifier,
Expand All @@ -418,7 +418,7 @@ def test_DataHubValidationAction_graceful_failure(


def test_DataHubValidationAction_not_supported(
ge_data_context: DataContext,
ge_data_context: FileDataContext,
ge_validator_spark: Validator,
ge_validation_result_suite: ExpectationSuiteValidationResult,
ge_validation_result_suite_id: ValidationResultIdentifier,
Expand Down
Loading