Skip to content

Commit 5a351c1

Browse files
smlindauersmlindauer
committed
Black reformatting
1 parent a7299f7 commit 5a351c1

File tree

3 files changed

+61
-16
lines changed

3 files changed

+61
-16
lines changed

‎tests/integration/test_import_model.py

Lines changed: 56 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,58 @@ def test_import_model(hmeq_dataset):
6161
model_files = {
6262
"Test.json": json.dumps({"Test": True, "TestNum": 1}),
6363
"Other_Test.json": json.dumps({"Other": None, "TestNum": 2}),
64-
"inputVar.json": json.dumps([{'name': 'LOAN', 'level': 'interval', 'type': 'decimal', 'length': 8}, {'name': 'MORTDUE', 'level': 'interval', 'type': 'decimal', 'length': 8}, {'name': 'VALUE', 'level': 'interval', 'type': 'decimal', 'length': 8}, {'name': 'YOJ', 'level': 'interval', 'type': 'decimal', 'length': 8}, {'name': 'DEROG', 'level': 'interval', 'type': 'decimal', 'length': 8}, {'name': 'DELINQ', 'level': 'interval', 'type': 'decimal', 'length': 8}, {'name': 'CLAGE', 'level': 'interval', 'type': 'decimal', 'length': 8}, {'name': 'NINQ', 'level': 'interval', 'type': 'decimal', 'length': 8}, {'name': 'CLNO', 'level': 'interval', 'type': 'decimal', 'length': 8}, {'name': 'DEBTINC', 'level': 'interval', 'type': 'decimal', 'length': 8}]),
65-
"outputVar.json": json.dumps([{'name': 'Classification', 'level': 'nominal', 'type': 'string', 'length': 1}, {'name': 'Probability', 'level': 'interval', 'type': 'decimal', 'length': 8}])
64+
"inputVar.json": json.dumps(
65+
[
66+
{"name": "LOAN", "level": "interval", "type": "decimal", "length": 8},
67+
{
68+
"name": "MORTDUE",
69+
"level": "interval",
70+
"type": "decimal",
71+
"length": 8,
72+
},
73+
{"name": "VALUE", "level": "interval", "type": "decimal", "length": 8},
74+
{"name": "YOJ", "level": "interval", "type": "decimal", "length": 8},
75+
{"name": "DEROG", "level": "interval", "type": "decimal", "length": 8},
76+
{"name": "DELINQ", "level": "interval", "type": "decimal", "length": 8},
77+
{"name": "CLAGE", "level": "interval", "type": "decimal", "length": 8},
78+
{"name": "NINQ", "level": "interval", "type": "decimal", "length": 8},
79+
{"name": "CLNO", "level": "interval", "type": "decimal", "length": 8},
80+
{
81+
"name": "DEBTINC",
82+
"level": "interval",
83+
"type": "decimal",
84+
"length": 8,
85+
},
86+
]
87+
),
88+
"outputVar.json": json.dumps(
89+
[
90+
{
91+
"name": "Classification",
92+
"level": "nominal",
93+
"type": "string",
94+
"length": 1,
95+
},
96+
{
97+
"name": "Probability",
98+
"level": "interval",
99+
"type": "decimal",
100+
"length": 8,
101+
},
102+
]
103+
),
66104
}
67105
model, model_files = im.import_model(
68-
model_files,
69-
"No_Score_Model",
70-
"Test_Project",
71-
overwrite_model=True
106+
model_files, "No_Score_Model", "Test_Project", overwrite_model=True
72107
)
73108
assert model == mr.get_model(model)
74109
for file in mr.get_model_contents(model):
75-
assert file.name in ["Test.json", "Other_Test.json", "inputVar.json", "outputVar.json"]
110+
assert file.name in [
111+
"Test.json",
112+
"Other_Test.json",
113+
"inputVar.json",
114+
"outputVar.json",
115+
]
76116

77117
input_data = hmeq_dataset.drop(columns=["BAD", "REASON", "JOB"])
78118
output_vars = ["Classification", "Probability"]
@@ -85,11 +125,17 @@ def test_import_model(hmeq_dataset):
85125
predict_method=[fake_predict, [int, int]],
86126
score_metrics=output_vars,
87127
binary_string=b"Test Binary String",
88-
overwrite_model=True
128+
overwrite_model=True,
89129
)
90130
assert model == mr.get_model(model)
91131
for file in mr.get_model_contents(model):
92-
assert file.name in ["Test.json", "Other_Test.json", "inputVar.json", "outputVar.json", "score_Test_Model.py"]
132+
assert file.name in [
133+
"Test.json",
134+
"Other_Test.json",
135+
"inputVar.json",
136+
"outputVar.json",
137+
"score_Test_Model.py",
138+
]
93139
else:
94140
model, model_files = im.import_model(
95141
model_files,
@@ -99,7 +145,7 @@ def test_import_model(hmeq_dataset):
99145
predict_method=[fake_predict, [int, int]],
100146
score_metrics=output_vars,
101147
binary_string=b"Test Binary String",
102-
overwrite_model=True
148+
overwrite_model=True,
103149
)
104150
assert model == mr.get_model(model)
105151
for file in mr.get_model_contents(model):

‎tests/unit/test_model_info.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ def test_sklearn_binary_classifier(cancer_dataset, model, algorithm):
8787
assert not info.is_clusterer
8888
assert info.analytic_function == "classification"
8989
assert info.algorithm == algorithm
90-
assert info.output_column_names == [target] # target_variable
91-
assert info.target_values == ["malignant"] # target_event
90+
assert info.output_column_names == [target] # target_variable
91+
assert info.target_values == ["malignant"] # target_event
9292
assert info.predict_function == model.predict
9393

9494
# If output frame contains a column name then it should be retained
@@ -118,6 +118,8 @@ def test_sklearn_binary_classifier(cancer_dataset, model, algorithm):
118118
119119
120120
"""
121+
122+
121123
def test_sklearn_binary_classifier_target_column_name(cancer_dataset):
122124
"""Verify output column name set correctly when target frame has no column name."""
123125
target = "Type"

‎tests/unit/test_zip_model.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ def _create_sample_archive(prefix=None, suffix=None, is_viya_4=False):
2323
_ = tempfile.NamedTemporaryFile(delete=False, suffix=s, dir=tmp_dir.name)
2424
if prefix:
2525
_ = tempfile.NamedTemporaryFile(
26-
delete=False,
27-
prefix=prefix,
28-
suffix=".py",
29-
dir=tmp_dir.name
26+
delete=False, prefix=prefix, suffix=".py", dir=tmp_dir.name
3027
)
3128
bytes_zip = zm.zip_files(tmp_dir.name, "Unit_Test_Model", is_viya4=is_viya_4)
3229
# Check that for files with a valid extension, the generated zip file contains

0 commit comments

Comments
 (0)