X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=runtime%2Foptim_engine.py;fp=runtime%2Foptim_engine.py;h=b303bbf16250fcc975b41b6e4453db5635747801;hb=a55cbabaef4975d5007363e59d4560cb30a855e3;hp=4a8788efc3c17b4012e12dec0155a1265556e72c;hpb=2024d8efab152980640b624402b6076da338ef7f;p=optf%2Fosdf.git diff --git a/runtime/optim_engine.py b/runtime/optim_engine.py index 4a8788e..b303bbf 100644 --- a/runtime/optim_engine.py +++ b/runtime/optim_engine.py @@ -19,10 +19,11 @@ from flask import Response from osdf.operation.exceptions import BusinessException -from .model_api import get_model_data -from .models.api.optim_request import OptimizationAPI -from .solvers.mzn.mzn_solver import solve as mzn_solve -from .solvers.py.py_solver import solve as py_solve +from osdf.utils.data_conversion import decode_data +from runtime.model_api import get_model_data +from runtime.models.api.optim_request import OptimizationAPI +from runtime.solvers.mzn.mzn_solver import solve as mzn_solve +from runtime.solvers.py.py_solver import solve as py_solve def is_valid_optim_request(request_json): @@ -69,7 +70,7 @@ def get_model_content(request_json): if model_id: status, data = get_model_data(model_id) if status == 200: - model_content = data[1] + model_content = decode_data(data[1]) solver = data[3] else: raise BusinessException('model_id [{}] not found in the model database'.format(model_id))