Extend parameters of model-recreate
Extend parameters of "model-recreate" so that user can recreate model with new model parameters. implements blueprint recreate-model Change-Id: I703b8d729cfd0d250b143e902100017596327f59
This commit is contained in:
parent
905fb575c7
commit
00fd417f26
|
@ -104,6 +104,9 @@ class ModelMixin(object):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
model = self.engine_api.get_model(context, id)
|
model = self.engine_api.get_model(context, id)
|
||||||
|
utils.is_valid_status(model.__class__.__name__,
|
||||||
|
model.status,
|
||||||
|
constants.STATUS_AVAILABLE)
|
||||||
experiment = self.engine_api.get_experiment(
|
experiment = self.engine_api.get_experiment(
|
||||||
context, model.experiment_id)
|
context, model.experiment_id)
|
||||||
template = self.engine_api.get_template(
|
template = self.engine_api.get_template(
|
||||||
|
@ -111,27 +114,33 @@ class ModelMixin(object):
|
||||||
except exception.NotFound:
|
except exception.NotFound:
|
||||||
raise exc.HTTPNotFound()
|
raise exc.HTTPNotFound()
|
||||||
|
|
||||||
|
display_name = b_model.get('display_name')
|
||||||
|
display_description = b_model.get('display_description')
|
||||||
source_dataset_url = b_model.get('source_dataset_url')
|
source_dataset_url = b_model.get('source_dataset_url')
|
||||||
dataset_format = b_model.get('dataset_format', 'csv')
|
dataset_format = b_model.get('dataset_format', 'csv')
|
||||||
|
model_type = b_model.get('model_type')
|
||||||
|
model_params = b_model.get('model_params')
|
||||||
swift_tenant = b_model.get('swift_tenant')
|
swift_tenant = b_model.get('swift_tenant')
|
||||||
swift_username = b_model.get('swift_username')
|
swift_username = b_model.get('swift_username')
|
||||||
swift_password = b_model.get('swift_password')
|
swift_password = b_model.get('swift_password')
|
||||||
|
|
||||||
self.engine_api.recreate_model(id,
|
new_model = self.engine_api.recreate_model(id,
|
||||||
context,
|
context,
|
||||||
source_dataset_url,
|
display_name,
|
||||||
dataset_format,
|
display_description,
|
||||||
model.model_type,
|
source_dataset_url,
|
||||||
model.model_params,
|
dataset_format,
|
||||||
template.id,
|
model_type,
|
||||||
template.job_template_id,
|
model_params,
|
||||||
experiment.id,
|
template.id,
|
||||||
experiment.cluster_id,
|
template.job_template_id,
|
||||||
swift_tenant,
|
experiment.id,
|
||||||
swift_username,
|
experiment.cluster_id,
|
||||||
swift_password)
|
swift_tenant,
|
||||||
|
swift_username,
|
||||||
|
swift_password)
|
||||||
|
|
||||||
return {'model': {'id': id}}
|
return self._view_builder.detail(req, new_model)
|
||||||
|
|
||||||
|
|
||||||
class ModelController(wsgi.Controller, ModelMixin, wsgi.AdminActionsMixin):
|
class ModelController(wsgi.Controller, ModelMixin, wsgi.AdminActionsMixin):
|
||||||
|
|
|
@ -393,14 +393,17 @@ class API(base.Base):
|
||||||
|
|
||||||
return model
|
return model
|
||||||
|
|
||||||
def recreate_model(self, id, context, source_dataset_url, dataset_format,
|
def recreate_model(self, id, context, name, description,
|
||||||
|
source_dataset_url, dataset_format,
|
||||||
model_type, model_params, template_id,
|
model_type, model_params, template_id,
|
||||||
job_template_id, experiment_id, cluster_id,
|
job_template_id, experiment_id, cluster_id,
|
||||||
swift_tenant, swift_username, swift_password):
|
swift_tenant, swift_username, swift_password):
|
||||||
"""Recreate a Model"""
|
"""Recreate a Model"""
|
||||||
policy.check_policy(context, 'model', 'recreate')
|
policy.check_policy(context, 'model', 'recreate')
|
||||||
|
|
||||||
model = {'source_dataset_url': source_dataset_url,
|
model = {'display_name': name,
|
||||||
|
'display_description': description,
|
||||||
|
'source_dataset_url': source_dataset_url,
|
||||||
'dataset_format': dataset_format,
|
'dataset_format': dataset_format,
|
||||||
'model_type': model_type,
|
'model_type': model_type,
|
||||||
'model_params': model_params,
|
'model_params': model_params,
|
||||||
|
|
Loading…
Reference in New Issue