Skip to content

Commit

Permalink
Ran black formatter of UTs.
Browse files Browse the repository at this point in the history
  • Loading branch information
@YashPandit4u
YashPandit4u committed Jun 15, 2024
1 parent 32f4826 commit 9f69e35
Showing 1 changed file with 88 additions and 79 deletions.
167 changes: 88 additions & 79 deletions tests/unitary/default_setup/model/test_datascience_model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,66 +164,67 @@
}

MODEL_BY_REF_JSON = {
"version": "1.0",
"type": "modelOSSReferenceDescription",
"models": [
{
"namespace": "ociodscdev",
"bucketName": "unzip-multi-model",
"prefix": "model-linear-1",
"objects": [
"version": "1.0",
"type": "modelOSSReferenceDescription",
"models": [
{
"name": "model-linear-1/linear-1.pkl",
"version": "ee260f4a-920a-4b4e-974a-c13a1032558e",
"sizeInBytes": 565
}
]
},
{
"namespace": "ociodscdev",
"bucketName": "unzip-multi-model",
"prefix": "model-linear-2",
"objects": [
{
"name": "model-linear-2/linear-2.pkl",
"version": "dc26a7d2-8041-4b37-8ed0-9e8c10869340",
"sizeInBytes": 565
}
]
},
{
"namespace": "ociodscdev",
"bucketName": "unzip-multi-model",
"prefix": "model-linear-3",
"objects": [
"namespace": "ociodscdev",
"bucketName": "unzip-multi-model",
"prefix": "model-linear-1",
"objects": [
{
"name": "model-linear-1/linear-1.pkl",
"version": "ee260f4a-920a-4b4e-974a-c13a1032558e",
"sizeInBytes": 565,
}
],
},
{
"name": "model-linear-3/linear-3.pkl",
"version": "a22c1211-f7d4-4fd4-96d8-4e3a048c5cf7",
"sizeInBytes": 565
}
]
},
{
"namespace": "ociodscdev",
"bucketName": "unzip-multi-model",
"prefix": "",
"objects": [
"namespace": "ociodscdev",
"bucketName": "unzip-multi-model",
"prefix": "model-linear-2",
"objects": [
{
"name": "model-linear-2/linear-2.pkl",
"version": "dc26a7d2-8041-4b37-8ed0-9e8c10869340",
"sizeInBytes": 565,
}
],
},
{
"name": "runtime.yaml",
"version": "30afb1a6-ab1f-42a3-95e3-09f61a0046fd",
"sizeInBytes": 334
"namespace": "ociodscdev",
"bucketName": "unzip-multi-model",
"prefix": "model-linear-3",
"objects": [
{
"name": "model-linear-3/linear-3.pkl",
"version": "a22c1211-f7d4-4fd4-96d8-4e3a048c5cf7",
"sizeInBytes": 565,
}
],
},
{
"name": "score.py",
"version": "c4ccaf96-05be-4174-ac3b-15dce2f558fe",
"sizeInBytes": 772
}
]
}
]
"namespace": "ociodscdev",
"bucketName": "unzip-multi-model",
"prefix": "",
"objects": [
{
"name": "runtime.yaml",
"version": "30afb1a6-ab1f-42a3-95e3-09f61a0046fd",
"sizeInBytes": 334,
},
{
"name": "score.py",
"version": "c4ccaf96-05be-4174-ac3b-15dce2f558fe",
"sizeInBytes": 772,
},
],
},
],
}
CONST_MODEL_FILE_DESCRIPTION = "modelDescription"


class TestDataScienceModel:
DEFAULT_PROPERTIES_PAYLOAD = {
"compartmentId": DSC_MODEL_PAYLOAD["compartmentId"],
Expand Down Expand Up @@ -1131,8 +1132,6 @@ def test_download_artifact_for_model_created_by_reference(

mock_large_download.assert_called()



@patch("ads.common.oci_client.OCIClientFactory")
def test_add_artifact(self, mock_oci_client_factory):
r = ObjectVersionSummary()
Expand All @@ -1151,54 +1150,64 @@ def test_add_artifact(self, mock_oci_client_factory):
# Mock object storage client
mock_object_storage_client = MagicMock()
mock_object_storage_client.list_object_versions.return_value = mock_response

mock_oci_client_factory.return_value.object_storage = mock_object_storage_client

# self.mock_dsc_model
# self.mock_dsc_model.add_artifact(uri="oci://bucket@namespace/prefix")
self.mock_dsc_model.add_artifact(namespace="namespace", bucket="bucket", prefix="prefix")
self.mock_dsc_model.add_artifact(
namespace="namespace", bucket="bucket", prefix="prefix"
)
expected_out = {
'version': '1.0',
'type': 'modelOSSReferenceDescription',
'models': [
"version": "1.0",
"type": "modelOSSReferenceDescription",
"models": [
{
'namespace': 'namespace',
'bucketName': 'bucket',
'prefix': 'prefix',
'objects': [
"namespace": "namespace",
"bucketName": "bucket",
"prefix": "prefix",
"objects": [
{
'name': 'model-linear-2/linear-2.pkl',
'version': 'dc26a7d2-8041-4b37-8ed0-9e8c10869340',
'sizeInBytes': 566
"name": "model-linear-2/linear-2.pkl",
"version": "dc26a7d2-8041-4b37-8ed0-9e8c10869340",
"sizeInBytes": 566,
}
]
],
}
]
],
}
assert self.mock_dsc_model.model_file_description == expected_out
# self.mock_dsc_model.remove_artifact(uri="oci://bucket@namespace/prefix")
self.mock_dsc_model.remove_artifact(namespace="namespace", bucket="bucket", prefix="prefix")
self.mock_dsc_model.remove_artifact(
namespace="namespace", bucket="bucket", prefix="prefix"
)
assert self.mock_dsc_model.model_file_description != expected_out
expected_out = {
'version': '1.0',
'type': 'modelOSSReferenceDescription',
'models': []
"version": "1.0",
"type": "modelOSSReferenceDescription",
"models": [],
}
assert self.mock_dsc_model.model_file_description == expected_out

def test_remove_artifact(self):
# self.mock_dsc_model.remove_artifact(uri="oci://unzip-multi-model@ociodscdev/model-linear-1")
self.mock_dsc_model.remove_artifact(namespace="ociodscdev", bucket="unzip-multi-model", prefix="model-linear-1")
self.mock_dsc_model.remove_artifact(
namespace="ociodscdev", bucket="unzip-multi-model", prefix="model-linear-1"
)

assert self.mock_dsc_model.model_file_description == None

self.mock_dsc_model.set_spec(CONST_MODEL_FILE_DESCRIPTION, deepcopy(MODEL_BY_REF_JSON))

self.mock_dsc_model.set_spec(
CONST_MODEL_FILE_DESCRIPTION, deepcopy(MODEL_BY_REF_JSON)
)
assert self.mock_dsc_model.model_file_description == MODEL_BY_REF_JSON

# self.mock_dsc_model.remove_artifact(uri="oci://unzip-multi-model@ociodscdev/model-linear-1")
self.mock_dsc_model.remove_artifact(namespace="ociodscdev", bucket="unzip-multi-model", prefix="model-linear-1")
self.mock_dsc_model.remove_artifact(
namespace="ociodscdev", bucket="unzip-multi-model", prefix="model-linear-1"
)
assert self.mock_dsc_model.model_file_description != MODEL_BY_REF_JSON

exptected_json = deepcopy(MODEL_BY_REF_JSON)
exptected_json["models"] = exptected_json["models"][1:]
assert self.mock_dsc_model.model_file_description == exptected_json
assert self.mock_dsc_model.model_file_description == exptected_json

0 comments on commit 9f69e35

Please sign in to comment.