Skip to content

Commit c9fc6ed

Browse files
author
j-so
committed
linting
1 parent 4bfa69b commit c9fc6ed

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

diabetes_regression/scoring/parallel_batchscore.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ def parse_args() -> List[str]:
6060
model_name = model_name_param[0][1]
6161

6262
model_version_param = [
63-
(sys.argv[idx], sys.argv[idx + 1])
64-
for idx, itm in enumerate(sys.argv)
65-
if itm == "--model_version"
63+
(sys.argv[idx], sys.argv[idx + 1])
64+
for idx, itm in enumerate(sys.argv)
65+
if itm == "--model_version"
6666
]
6767

6868
if len(model_version_param) == 0:
@@ -109,7 +109,7 @@ def init():
109109

110110
model_filter = parse_args()
111111
amlmodel = get_model(
112-
model_name=env.model_filter[0],
112+
model_name=model_filter[0],
113113
model_version=model_filter[1],
114114
tag_name=model_filter[2],
115115
tag_value=model_filter[3])

diabetes_regression/util/model_helper.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def get_current_workspace() -> Workspace:
2424

2525
def get_model(
2626
model_name: str,
27-
model_version: int = None, # If none, return latest model
27+
model_version: int = None, # If none, return latest model
2828
tag_name: str = None,
2929
tag_value: str = None,
3030
aml_workspace: Workspace = None
@@ -36,18 +36,22 @@ def get_model(
3636
Parameters:
3737
aml_workspace (Workspace): aml.core Workspace that the model lives.
3838
model_name (str): name of the model we are looking for
39-
(optional) model_version (str): version of the model. Returns latest if not provided.
39+
(optional) model_version (str): model version. Latest if not provided.
4040
(optional) tag (str): the tag value & name the model was registered under.
4141
4242
Return:
4343
A single aml model from the workspace that matches the name and tag.
4444
"""
4545
if aml_workspace is None:
46-
print("No workspace defined - using current experiment workspace.")
47-
aml_workspace = get_current_workspace()
46+
print("No workspace defined - using current experiment workspace.")
47+
aml_workspace = get_current_workspace()
4848

4949
if tagname is not None and tagvalue is not None:
50-
model = Model(aml_workspace, name=model_name, version=model_version, tags=[[tag_name, tag_value]])
50+
model = AMLModel(
51+
aml_workspace,
52+
name=model_name,
53+
version=model_version,
54+
tags=[[tag_name, tag_value]])
5155
elif (tagname is None and tagvalue is not None) or (
5256
tagvalue is None and tagname is not None
5357
):
@@ -56,5 +60,5 @@ def get_model(
5660
+ "or excluded" # NOQA: E501
5761
)
5862
else:
59-
model = Model(aml_workspace, name=env.model_name, version=env.model_version)
63+
model = AMLModel(aml_workspace, name=env.model_name, version=env.model_version) # NOQA: E501
6064
return model

ml_service/pipelines/diabetes_regression_build_parallel_batchscore_pipeline.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ def parse_args() -> Namespace:
6161
args = parser.parse_args()
6262
return args
6363

64+
6465
def get_or_create_datastore(
6566
datastorename: str, ws: Workspace, env: Env, input: bool = True
6667
) -> Datastore:

ml_service/pipelines/diabetes_regression_verify_train_pipeline.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ def main():
5454
try:
5555
tag_name = 'BuildId'
5656
model = get_model(
57-
model_name=model_name, tag_name=tag_name, tag_value=build_id, aml_workspace=exp.workspace)
57+
model_name=model_name,
58+
tag_name=tag_name,
59+
tag_value=build_id,
60+
aml_workspace=exp.workspace)
61+
5862
if (model is not None):
5963
print("Model was registered for this build.")
6064
if (model is None):

0 commit comments

Comments
 (0)