Skip to content

Commit 35fc7e4

Browse files
authored
chore: cleanup type errors in tests/system/small/test_encryption.py (#763)
1 parent 8fa5f49 commit 35fc7e4

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

tests/system/small/test_encryption.py

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -242,14 +242,12 @@ def test_bqml(bq_cmek, session_with_bq_cmek, penguins_table_id):
242242
model.fit(X_train, y_train)
243243

244244
assert model is not None
245-
# TODO(b/340879287): fix type error
246-
assert model._bqml_model.model.encryption_configuration is not None # type: ignore
247-
# TODO(b/340879287): fix type error
248-
assert model._bqml_model.model.encryption_configuration.kms_key_name == bq_cmek # type: ignore
245+
assert model._bqml_model is not None
246+
assert model._bqml_model.model.encryption_configuration is not None
247+
assert model._bqml_model.model.encryption_configuration.kms_key_name == bq_cmek
249248

250249
# Assert that model exists in BQ with intended encryption
251-
# TODO(b/340879287): fix type error
252-
model_bq = session_with_bq_cmek.bqclient.get_model(model._bqml_model.model_name) # type: ignore
250+
model_bq = session_with_bq_cmek.bqclient.get_model(model._bqml_model.model_name)
253251
assert model_bq.encryption_configuration.kms_key_name == bq_cmek
254252

255253
# Explicitly save the model to a destination and assert that encryption holds
@@ -260,12 +258,12 @@ def test_bqml(bq_cmek, session_with_bq_cmek, penguins_table_id):
260258
f"{model_ref.project}.{model_ref.dataset_id}.{model_ref.model_id}"
261259
)
262260
new_model = model.to_gbq(model_ref_full_name)
263-
# TODO(b/340879287): fix type error
264-
assert new_model._bqml_model.model.encryption_configuration.kms_key_name == bq_cmek # type: ignore
261+
assert new_model._bqml_model is not None
262+
assert new_model._bqml_model.model.encryption_configuration is not None
263+
assert new_model._bqml_model.model.encryption_configuration.kms_key_name == bq_cmek
265264

266265
# Assert that model exists in BQ with intended encryption
267-
# TODO(b/340879287): fix type error
268-
model_bq = session_with_bq_cmek.bqclient.get_model(new_model._bqml_model.model_name) # type: ignore
266+
model_bq = session_with_bq_cmek.bqclient.get_model(new_model._bqml_model.model_name)
269267
assert model_bq.encryption_configuration.kms_key_name == bq_cmek
270268

271269
# Assert that model registration keeps the encryption
@@ -279,11 +277,11 @@ def test_bqml(bq_cmek, session_with_bq_cmek, penguins_table_id):
279277
# https://cloud.google.com/vertex-ai/docs/general/cmek#create_resources_with_the_kms_key.
280278
# bigframes.ml does not provide any API for the model deployment.
281279
model_registered = new_model.register()
282-
# TODO(b/340879287): fix type error
280+
assert model_registered._bqml_model is not None
281+
assert model_registered._bqml_model.model.encryption_configuration is not None
283282
assert (
284-
model_registered._bqml_model.model.encryption_configuration.kms_key_name # type: ignore
283+
model_registered._bqml_model.model.encryption_configuration.kms_key_name
285284
== bq_cmek
286285
)
287-
# TODO(b/340879287): fix type error
288-
model_bq = session_with_bq_cmek.bqclient.get_model(new_model._bqml_model.model_name) # type: ignore
286+
model_bq = session_with_bq_cmek.bqclient.get_model(new_model._bqml_model.model_name)
289287
assert model_bq.encryption_configuration.kms_key_name == bq_cmek

0 commit comments

Comments
 (0)