@@ -417,11 +417,13 @@ def bq_delete_dataset_mock(bq_client_mock):
417417 with patch .object (bq_client_mock , "delete_dataset" ) as bq_delete_dataset_mock :
418418 yield bq_delete_dataset_mock
419419
420+
420421@pytest .fixture
421422def bq_delete_table_mock (bq_client_mock ):
422423 with patch .object (bq_client_mock , "delete_table" ) as bq_delete_table_mock :
423424 yield bq_delete_table_mock
424425
426+
425427@pytest .fixture
426428def bqs_client_mock ():
427429 mock = MagicMock (bigquery_storage .BigQueryReadClient )
@@ -1705,7 +1707,13 @@ def test_batch_serve_to_df(self, batch_read_feature_values_mock):
17051707 "get_project_mock" ,
17061708 )
17071709 @patch ("uuid.uuid4" , uuid_mock )
1708- def test_batch_serve_to_df_user_specified_bq_dataset (self , batch_read_feature_values_mock , bq_create_dataset_mock , bq_delete_dataset_mock , bq_delete_table_mock ):
1710+ def test_batch_serve_to_df_user_specified_bq_dataset (
1711+ self ,
1712+ batch_read_feature_values_mock ,
1713+ bq_create_dataset_mock ,
1714+ bq_delete_dataset_mock ,
1715+ bq_delete_table_mock ,
1716+ ):
17091717
17101718 aiplatform .init (project = _TEST_PROJECT_DIFF )
17111719
@@ -1715,16 +1723,18 @@ def test_batch_serve_to_df_user_specified_bq_dataset(self, batch_read_feature_va
17151723
17161724 read_instances_df = pd .DataFrame ()
17171725
1718- expected_temp_bq_dataset_name = 'my_dataset_name'
1719- expected_temp_bq_dataset_id = f"{ _TEST_PROJECT } .{ expected_temp_bq_dataset_name } " [
1720- :1024
1721- ]
1722- expected_temp_bq_batch_serve_table_name = f"tmp_batch_serve_{ uuid .uuid4 ()} " .replace (
1723- "-" , "_"
1726+ expected_temp_bq_dataset_name = "my_dataset_name"
1727+ expected_temp_bq_dataset_id = (
1728+ f"{ _TEST_PROJECT } .{ expected_temp_bq_dataset_name } " [:1024 ]
17241729 )
1725- expected_temp_bq_batch_serve_table_id = f"{ expected_temp_bq_dataset_id } .{ expected_temp_bq_batch_serve_table_name } "
1726- expected_temp_bq_read_instances_table_name = f"tmp_read_instances_{ uuid .uuid4 ()} " .replace (
1727- "-" , "_"
1730+ expected_temp_bq_batch_serve_table_name = (
1731+ f"tmp_batch_serve_{ uuid .uuid4 ()} " .replace ("-" , "_" )
1732+ )
1733+ expected_temp_bq_batch_serve_table_id = (
1734+ f"{ expected_temp_bq_dataset_id } .{ expected_temp_bq_batch_serve_table_name } "
1735+ )
1736+ expected_temp_bq_read_instances_table_name = (
1737+ f"tmp_read_instances_{ uuid .uuid4 ()} " .replace ("-" , "_" )
17281738 )
17291739 expected_temp_bq_read_instances_table_id = f"{ expected_temp_bq_dataset_id } .{ expected_temp_bq_read_instances_table_name } "
17301740
@@ -1751,7 +1761,6 @@ def test_batch_serve_to_df_user_specified_bq_dataset(self, batch_read_feature_va
17511761 bigquery_read_instances = gca_io .BigQuerySource (
17521762 input_uri = f"bq://{ expected_temp_bq_read_instances_table_id } "
17531763 ),
1754-
17551764 )
17561765 )
17571766
@@ -1779,6 +1788,7 @@ def test_batch_serve_to_df_user_specified_bq_dataset(self, batch_read_feature_va
17791788 bq_create_dataset_mock .assert_not_called ()
17801789 bq_delete_dataset_mock .assert_not_called ()
17811790
1791+
17821792class TestEntityType :
17831793 def setup_method (self ):
17841794 reload (initializer )
0 commit comments