From 7b6cbd5aa0799b04e61a3eb8d8c9299fc71c4a2d Mon Sep 17 00:00:00 2001 From: Ivan Zhang Date: Thu, 8 Aug 2019 11:31:48 -0400 Subject: [PATCH 1/4] load handler after packages have been installed --- pkg/workloads/cortex/tf_api/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/workloads/cortex/tf_api/api.py b/pkg/workloads/cortex/tf_api/api.py index 57b56d779f..6b7f3ccde7 100644 --- a/pkg/workloads/cortex/tf_api/api.py +++ b/pkg/workloads/cortex/tf_api/api.py @@ -447,16 +447,16 @@ def start(args): local_cache["ctx"] = ctx try: - if api.get("request_handler_impl_key") is not None: - local_cache["request_handler"] = ctx.get_request_handler_impl(api["name"]) if not util.is_resource_ref(api["model"]): if api.get("request_handler") is not None: package.install_packages(ctx.python_packages, ctx.storage) + local_cache["request_handler"] = ctx.get_request_handler_impl(api["name"]) if not os.path.isdir(args.model_dir): ctx.storage.download_and_unzip_external(api["model"], args.model_dir) else: package.install_packages(ctx.python_packages, ctx.storage) + local_cache["request_handler"] = ctx.get_request_handler_impl(api["name"]) model_name = util.get_resource_ref(api["model"]) model = ctx.models[model_name] estimator = ctx.estimators[model["estimator"]] From 3d8923a209512e7bb8a57f229a1be38944b0fbe7 Mon Sep 17 00:00:00 2001 From: vishal Date: Thu, 8 Aug 2019 12:07:52 -0400 Subject: [PATCH 2/4] Refactor package and request_handler loading for readability --- pkg/workloads/cortex/tf_api/api.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/workloads/cortex/tf_api/api.py b/pkg/workloads/cortex/tf_api/api.py index 6b7f3ccde7..572ca40e55 100644 --- a/pkg/workloads/cortex/tf_api/api.py +++ b/pkg/workloads/cortex/tf_api/api.py @@ -448,15 +448,16 @@ def start(args): try: + if api.get("request_handler") is not None or util.is_resource_ref(api["model"]): + package.install_packages(ctx.python_packages, ctx.storage) + + if api.get("request_handler") is not None: + local_cache["request_handler"] = ctx.get_request_handler_impl(api["name"]) + if not util.is_resource_ref(api["model"]): - if api.get("request_handler") is not None: - package.install_packages(ctx.python_packages, ctx.storage) - local_cache["request_handler"] = ctx.get_request_handler_impl(api["name"]) if not os.path.isdir(args.model_dir): ctx.storage.download_and_unzip_external(api["model"], args.model_dir) else: - package.install_packages(ctx.python_packages, ctx.storage) - local_cache["request_handler"] = ctx.get_request_handler_impl(api["name"]) model_name = util.get_resource_ref(api["model"]) model = ctx.models[model_name] estimator = ctx.estimators[model["estimator"]] From cda904b8e588b52acfd7f12a2bedb4434e98ae97 Mon Sep 17 00:00:00 2001 From: vishal Date: Thu, 8 Aug 2019 16:10:03 +0000 Subject: [PATCH 3/4] Update onnx api --- pkg/workloads/cortex/onnx_serve/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/workloads/cortex/onnx_serve/api.py b/pkg/workloads/cortex/onnx_serve/api.py index d42588f72a..1eb3263fdb 100644 --- a/pkg/workloads/cortex/onnx_serve/api.py +++ b/pkg/workloads/cortex/onnx_serve/api.py @@ -226,7 +226,7 @@ def start(args): local_cache["api"] = api local_cache["ctx"] = ctx - if api.get("request_handler_impl_key") is not None: + if api.get("request_handler") is not None: package.install_packages(ctx.python_packages, ctx.storage) local_cache["request_handler"] = ctx.get_request_handler_impl(api["name"]) From e09a3c27ea7abe70eb0288f91b60dfc6cf155a71 Mon Sep 17 00:00:00 2001 From: vishal Date: Thu, 8 Aug 2019 16:12:51 +0000 Subject: [PATCH 4/4] Fix linting --- pkg/workloads/cortex/tf_api/api.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/workloads/cortex/tf_api/api.py b/pkg/workloads/cortex/tf_api/api.py index 572ca40e55..91b2818ed2 100644 --- a/pkg/workloads/cortex/tf_api/api.py +++ b/pkg/workloads/cortex/tf_api/api.py @@ -447,10 +447,9 @@ def start(args): local_cache["ctx"] = ctx try: - if api.get("request_handler") is not None or util.is_resource_ref(api["model"]): package.install_packages(ctx.python_packages, ctx.storage) - + if api.get("request_handler") is not None: local_cache["request_handler"] = ctx.get_request_handler_impl(api["name"])