Skip to content

Commit 556512c

Browse files
VipulMascarenhasVipulMascarenhas
committed
fix tests
1 parent 987382b commit 556512c

File tree

2 files changed

+49
-57
lines changed

2 files changed

+49
-57
lines changed

‎tests/unitary/with_extras/aqua/test_cli.py

+13-11
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,17 @@ def test_aqua_command_without_compartment_env_var(self, name, session_ocid):
7777
reload(ads.aqua.cli)
7878
with patch("ads.aqua.cli.set_log_level") as mock_setting_log:
7979
with patch("ads.aqua.logger.error") as mock_logger_error:
80-
AquaCommand()
81-
mock_setting_log.assert_called_with(
82-
TestAquaCLI.DEFAULT_AQUA_CLI_LOGGING_LEVEL
83-
)
84-
mock_logger_error.assert_any_call(
85-
"ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua."
86-
)
87-
if session_ocid:
88-
mock_logger_error.assert_any_call(
89-
f"Aqua is not available for the notebook session {session_ocid}."
80+
with patch("ads.aqua.logger.debug") as mock_logger_debug:
81+
AquaCommand()
82+
mock_setting_log.assert_called_with(
83+
TestAquaCLI.DEFAULT_AQUA_CLI_LOGGING_LEVEL
9084
)
91-
mock_exit.assert_called_with(1)
85+
mock_logger_debug.assert_any_call(
86+
"ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua."
87+
)
88+
if session_ocid:
89+
mock_logger_error.assert_any_call(
90+
f"Aqua is not available for the notebook session {session_ocid}. For more information, "
91+
f"please refer to the documentation."
92+
)
93+
mock_exit.assert_called_with(1)

‎tests/unitary/with_extras/aqua/test_finetuning.py

+36-46
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
from ads.model.datascience_model import DataScienceModel
2222
from ads.model.model_metadata import ModelCustomMetadata
2323

24-
class FineTuningTestCase(TestCase):
2524

25+
class FineTuningTestCase(TestCase):
2626
SERVICE_COMPARTMENT_ID = "ocid1.compartment.oc1..<OCID>"
2727

2828
def setUp(self):
@@ -61,20 +61,20 @@ def test_create_fine_tuning(
6161
mock_job_create,
6262
mock_job_id,
6363
mock_job_name,
64-
mock_job_run
64+
mock_job_run,
6565
):
6666
custom_metadata_list = ModelCustomMetadata()
6767
custom_metadata_list.add(
6868
key=FineTuneCustomMetadata.SERVICE_MODEL_ARTIFACT_LOCATION.value,
69-
value="test_service_model_artifact_location"
69+
value="test_service_model_artifact_location",
7070
)
7171
custom_metadata_list.add(
7272
key=FineTuneCustomMetadata.SERVICE_MODEL_DEPLOYMENT_CONTAINER.value,
73-
value="test_service_model_deployment_container"
73+
value="test_service_model_deployment_container",
7474
)
7575
custom_metadata_list.add(
7676
key=FineTuneCustomMetadata.SERVICE_MODEL_FINE_TUNE_CONTAINER.value,
77-
value="test_service_model_fine_tune_container"
77+
value="test_service_model_fine_tune_container",
7878
)
7979

8080
ft_source = MagicMock()
@@ -84,10 +84,7 @@ def test_create_fine_tuning(
8484
ft_source.custom_metadata_list = custom_metadata_list
8585
mock_get_source.return_value = ft_source
8686

87-
mock_mvs_create.return_value = (
88-
"test_experiment_id",
89-
"test_experiment_name"
90-
)
87+
mock_mvs_create.return_value = ("test_experiment_id", "test_experiment_name")
9188

9289
ft_model = MagicMock()
9390
ft_model.id = "test_ft_model_id"
@@ -97,10 +94,7 @@ def test_create_fine_tuning(
9794

9895
mock_get_finetuning_config.return_value = {
9996
"shape": {
100-
"VM.GPU.A10.1": {
101-
"batch_size": 1,
102-
"replica": 1
103-
},
97+
"VM.GPU.A10.1": {"batch_size": 1, "replica": 1},
10498
}
10599
}
106100
mock_get_container_image.return_value = "test_container_image"
@@ -122,53 +116,49 @@ def test_create_fine_tuning(
122116
ft_name="test_ft_name",
123117
dataset_path="oci://ds_bucket@namespace/prefix/dataset.jsonl",
124118
report_path="oci://report_bucket@namespace/prefix/",
125-
ft_parameters={
126-
"epochs":1,
127-
"learning_rate":0.02
128-
},
119+
ft_parameters={"epochs": 1, "learning_rate": 0.02},
129120
shape_name="VM.GPU.A10.1",
130121
replica=1,
131122
validation_set_size=0.2,
132123
block_storage_size=1,
133124
experiment_name="test_experiment_name",
134125
)
135126

136-
aqua_ft_summary = self.app.create(
137-
**create_aqua_ft_details
138-
)
127+
aqua_ft_summary = self.app.create(**create_aqua_ft_details)
139128

140129
assert asdict(aqua_ft_summary) == {
141-
'console_url': f'https://cloud.oracle.com/data-science/models/{ft_model.id}?region={self.app.region}',
142-
'experiment': {
143-
'id': f'{mock_mvs_create.return_value[0]}',
144-
'name': f'{mock_mvs_create.return_value[1]}',
145-
'url': f'https://cloud.oracle.com/data-science/model-version-sets/{mock_mvs_create.return_value[0]}?region={self.app.region}'
130+
"console_url": f"https://cloud.oracle.com/data-science/models/{ft_model.id}?region={self.app.region}",
131+
"experiment": {
132+
"id": f"{mock_mvs_create.return_value[0]}",
133+
"name": f"{mock_mvs_create.return_value[1]}",
134+
"url": f"https://cloud.oracle.com/data-science/model-version-sets/{mock_mvs_create.return_value[0]}?region={self.app.region}",
146135
},
147-
'id': f'{ft_model.id}',
148-
'job': {
149-
'id': f'{mock_job_id.return_value}',
150-
'name': f'{mock_job_name.return_value}',
151-
'url': f'https://cloud.oracle.com/data-science/jobs/{mock_job_id.return_value}?region={self.app.region}'
136+
"id": f"{ft_model.id}",
137+
"job": {
138+
"id": f"{mock_job_id.return_value}",
139+
"name": f"{mock_job_name.return_value}",
140+
"url": f"https://cloud.oracle.com/data-science/jobs/{mock_job_id.return_value}?region={self.app.region}",
152141
},
153-
'lifecycle_details': f'{ft_job_run.lifecycle_details}',
154-
'lifecycle_state': f'{ft_job_run.lifecycle_state}',
155-
'name': f'{ft_model.display_name}',
156-
'parameters': {
157-
'epochs': 1,
158-
'learning_rate': 0.02
142+
"lifecycle_details": f"{ft_job_run.lifecycle_details}",
143+
"lifecycle_state": f"{ft_job_run.lifecycle_state}",
144+
"name": f"{ft_model.display_name}",
145+
"parameters": {
146+
"epochs": 1,
147+
"learning_rate": 0.02,
148+
"sample_packing": "True",
159149
},
160-
'source': {
161-
'id': f'{ft_source.id}',
162-
'name': f'{ft_source.display_name}',
163-
'url': f'https://cloud.oracle.com/data-science/models/{ft_source.id}?region={self.app.region}'
150+
"source": {
151+
"id": f"{ft_source.id}",
152+
"name": f"{ft_source.display_name}",
153+
"url": f"https://cloud.oracle.com/data-science/models/{ft_source.id}?region={self.app.region}",
164154
},
165-
'tags': {
166-
'aqua_finetuning': 'aqua_finetuning',
167-
'finetuning_experiment_id': f'{mock_mvs_create.return_value[0]}',
168-
'finetuning_job_id': f'{mock_job_id.return_value}',
169-
'finetuning_source': f'{ft_source.id}'
155+
"tags": {
156+
"aqua_finetuning": "aqua_finetuning",
157+
"finetuning_experiment_id": f"{mock_mvs_create.return_value[0]}",
158+
"finetuning_job_id": f"{mock_job_id.return_value}",
159+
"finetuning_source": f"{ft_source.id}",
170160
},
171-
'time_created': f'{ft_model.time_created}'
161+
"time_created": f"{ft_model.time_created}",
172162
}
173163

174164
def test_exit_code_message(self):

0 commit comments

Comments
 (0)