Revert "[MAINTENANCE] Add context to BatchConfig, and fetch assets …

…by name (#8982)"

This reverts commit 6bd8a63.

great_expectations/core/batch_config.py

@@ -1,14 +1,11 @@
 from typing import Optional
 
 from great_expectations.compatibility import pydantic
-from great_expectations.data_context.data_context.abstract_data_context import (
-    AbstractDataContext,
-)
 from great_expectations.datasource.fluent.batch_request import (
     BatchRequest,
     BatchRequestOptions,
 )
-from great_expectations.datasource.fluent.interfaces import DataAsset, Datasource
+from great_expectations.datasource.fluent.interfaces import DataAsset
 
 
 class BatchConfig(pydantic.BaseModel):
@@ -18,20 +15,7 @@ class BatchConfig(pydantic.BaseModel):
     TODO: Add splitters and sorters?
     """
 
-    class Config:
-        arbitrary_types_allowed = True
-
-    context: AbstractDataContext
-    datasource_name: str
-    data_asset_name: str
-
-    @property
-    def data_asset(self) -> DataAsset:
-        """Get the DataAsset referenced by this BatchConfig."""
-        datasource = self.context.get_datasource(self.datasource_name)
-        assert isinstance(datasource, Datasource)
-
-        return datasource.get_asset(self.data_asset_name)
+    data_asset: DataAsset
 
     def build_batch_request(
         self, batch_request_options: Optional[BatchRequestOptions] = None

tests/conftest.py

@@ -3245,22 +3245,13 @@ def sqlite_connection_string() -> str:
     return f"sqlite:///{db_file_path}"
 
 
-@pytest.fixture
-def fds_data_context_datasource_name() -> str:
-    return "sqlite_datasource"
-
-
 @pytest.fixture
 def fds_data_context(
-    sa,
-    fds_data_context_datasource_name: str,
-    empty_data_context: AbstractDataContext,
-    sqlite_connection_string: str,
+    sa, empty_data_context: AbstractDataContext, sqlite_connection_string: str
 ) -> AbstractDataContext:
     context = empty_data_context
     datasource = context.sources.add_sqlite(
-        name=fds_data_context_datasource_name,
-        connection_string=sqlite_connection_string,
+        name="sqlite_datasource", connection_string=sqlite_connection_string
     )
 
     datasource.add_query_asset(

tests/core/test_batch_config.py

@@ -6,54 +6,8 @@
 import pytest
 
 from great_expectations.core.batch_config import BatchConfig
-from great_expectations.data_context.data_context.abstract_data_context import (
-    AbstractDataContext,
-)
 from great_expectations.datasource.fluent.batch_request import BatchRequestOptions
 from great_expectations.datasource.fluent.interfaces import DataAsset
-from great_expectations.datasource.fluent.sql_datasource import TableAsset
-from great_expectations.datasource.fluent.sqlite_datasource import SqliteDatasource
-
-
-@pytest.fixture
-def mock_asset_name() -> str:
-    return "foo"
-
-
-@pytest.fixture
-def mock_asset(
-    mock_asset_name: str,
-) -> TableAsset:
-    mock_data_asset = Mock(spec=TableAsset)
-    mock_data_asset.name = mock_asset_name
-    return mock_data_asset
-
-
-@pytest.fixture
-def data_context(
-    fds_data_context: AbstractDataContext,
-    fds_data_context_datasource_name: str,
-    mock_asset: TableAsset,
-) -> AbstractDataContext:
-    datasource = fds_data_context.get_datasource(fds_data_context_datasource_name)
-    assert isinstance(datasource, SqliteDatasource)
-    datasource.assets.append(mock_asset)
-    return fds_data_context
-
-
-@pytest.mark.unit
-def test_data_asset(
-    data_context: AbstractDataContext,
-    fds_data_context_datasource_name: str,
-    mock_asset_name: str,
-    mock_asset: DataAsset,
-):
-    batch_config = BatchConfig(
-        context=data_context,
-        datasource_name=fds_data_context_datasource_name,
-        data_asset_name=mock_asset_name,
-    )
-    assert batch_config.data_asset == mock_asset
 
 
 @pytest.mark.parametrize(
@@ -64,20 +18,12 @@ def test_data_asset(
     ],
 )
 @pytest.mark.unit
-def test_build_batch_request(
-    batch_request_options: Optional[BatchRequestOptions],
-    data_context: AbstractDataContext,
-    fds_data_context_datasource_name: str,
-    mock_asset_name: str,
-):
-    batch_config = BatchConfig(
-        context=data_context,
-        datasource_name=fds_data_context_datasource_name,
-        data_asset_name=mock_asset_name,
-    )
+def test_build_batch_request(batch_request_options: Optional[BatchRequestOptions]):
+    batch_config = BatchConfig(data_asset=Mock(spec=DataAsset))
 
     batch_config.build_batch_request(batch_request_options=batch_request_options)
 
     mock_build_batch_request = batch_config.data_asset.build_batch_request
     assert isinstance(mock_build_batch_request, Mock)
+
     mock_build_batch_request.assert_called_once_with(options=batch_request_options)

tests/validator/test_v1_validator.py

@@ -5,6 +5,7 @@
 from great_expectations.data_context.data_context.abstract_data_context import (
     AbstractDataContext,
 )
+from great_expectations.datasource.fluent.sqlite_datasource import SqliteDatasource
 from great_expectations.expectations.core.expect_column_values_to_be_between import (
     ExpectColumnValuesToBeBetween,
 )
@@ -43,26 +44,22 @@ def expectation_suite(
 
 
 @pytest.fixture
-def batch_config(
-    fds_data_context: AbstractDataContext,
-    fds_data_context_datasource_name: str,
-) -> BatchConfig:
+def batch_config(fds_data_context: AbstractDataContext) -> BatchConfig:
+    datasource = fds_data_context.get_datasource("sqlite_datasource")
+    assert isinstance(datasource, SqliteDatasource)
     return BatchConfig(
-        context=fds_data_context,
-        datasource_name=fds_data_context_datasource_name,
-        data_asset_name="trip_asset",
+        data_asset=datasource.get_asset("trip_asset"),
     )
 
 
 @pytest.fixture
 def batch_config_with_event_type_splitter(
     fds_data_context: AbstractDataContext,
-    fds_data_context_datasource_name: str,
 ) -> BatchConfig:
+    datasource = fds_data_context.get_datasource("sqlite_datasource")
+    assert isinstance(datasource, SqliteDatasource)
     return BatchConfig(
-        context=fds_data_context,
-        datasource_name=fds_data_context_datasource_name,
-        data_asset_name="trip_asset_split_by_event_type",
+        data_asset=datasource.get_asset("trip_asset_split_by_event_type"),
     )