Fix js_content duplicate error. Add encoding for file openings

Author: satishpasumarthi

docker/build_artifacts/sagemaker/multi_model_utils.py

@@ -21,7 +21,7 @@
 
 @contextmanager
 def lock(path=DEFAULT_LOCK_FILE):
-    f = open(path, "w")
+    f = open(path, "w", encoding="utf8")
     fd = f.fileno()
     fcntl.lockf(fd, fcntl.LOCK_EX)
 

docker/build_artifacts/sagemaker/nginx.conf.template

@@ -44,17 +44,14 @@ http {
     }
 
     location /ping {
-        js_content tensorflowServing.ping;
         %FORWARD_PING_REQUESTS%;
     }
 
     location /invocations {
-        js_content tensorflowServing.invocations;
         %FORWARD_INVOCATION_REQUESTS%;
     }
 
     location /models {
-        js_content tensorflowServing.models;
         proxy_pass http://gunicorn_upstream/models;
     }
 
@@ -65,9 +62,4 @@ http {
     keepalive_timeout 3;
   }
 }
-
-export default {invocations, ping, ping_without_model, return_error,
-  tfs_json_request, make_tfs_uri, parse_custom_attributes,
-  json_request, is_tfs_json, is_json_lines, generic_json_request,
-  json_lines_request, csv_request};
 

docker/build_artifacts/sagemaker/python_service.py

@@ -150,7 +150,7 @@ def _handle_load_model_post(self, res, data):  # noqa: C901
                 tfs_config_file = "/sagemaker/tfs-config/{}/model-config.cfg".format(model_name)
                 log.info("tensorflow serving model config: \n%s\n", tfs_config)
                 os.makedirs(os.path.dirname(tfs_config_file))
-                with open(tfs_config_file, "w") as f:
+                with open(tfs_config_file, "w", encoding="utf8") as f:
                     f.write(tfs_config)
 
                 batching_config_file = "/sagemaker/batching/{}/batching-config.cfg".format(

docker/build_artifacts/sagemaker/serve.py

@@ -24,8 +24,8 @@
 logging.basicConfig(level=logging.INFO)
 log = logging.getLogger(__name__)
 
-JS_PING = "js_content ping"
-JS_INVOCATIONS = "js_content invocations"
+JS_PING = "js_content tensorflowServing.ping"
+JS_INVOCATIONS = "js_content tensorflowServing.invocations"
 GUNICORN_PING = "proxy_pass http://gunicorn_upstream/ping"
 GUNICORN_INVOCATIONS = "proxy_pass http://gunicorn_upstream/invocations"
 MULTI_MODEL = "s" if os.environ.get("SAGEMAKER_MULTI_MODEL", "False").lower() == "true" else ""
@@ -159,7 +159,7 @@ def _create_tfs_config(self):
 
         log.info("tensorflow serving model config: \n%s\n", config)
 
-        with open(self._tfs_config_path, "w") as f:
+        with open(self._tfs_config_path, "w", encoding="utf8") as f:
             f.write(config)
 
     def _setup_gunicorn(self):
@@ -258,11 +258,11 @@ def _create_nginx_config(self):
         config = pattern.sub(lambda x: template_values[x.group(1)], template)
         log.info("nginx config: \n%s\n", config)
 
-        with open("/sagemaker/nginx.conf", "w") as f:
+        with open("/sagemaker/nginx.conf", "w", encoding="utf8") as f:
             f.write(config)
 
     def _read_nginx_template(self):
-        with open("/sagemaker/nginx.conf.template", "r") as f:
+        with open("/sagemaker/nginx.conf.template", "r", encoding="utf8") as f:
             template = f.read()
             if not template:
                 raise ValueError("failed to read nginx.conf.template")

docker/build_artifacts/sagemaker/tensorflowServing.js

@@ -232,3 +232,8 @@ function csv_request(r) {
     builder.push(']}')
     tfs_json_request(r, builder.join(''))
 }
+
+export default {invocations, ping, ping_without_model, return_error,
+    tfs_json_request, make_tfs_uri, parse_custom_attributes,
+    json_request, is_tfs_json, is_json_lines, generic_json_request,
+    json_lines_request, csv_request};

docker/build_artifacts/sagemaker/tfs_utils.py

@@ -220,7 +220,7 @@ def __init__(self, key, env_var, value, defaulted_message):
         config += "%s { value: %s }\n" % (batching_parameter.key, batching_parameter.value)
 
     log.info("batching config: \n%s\n", config)
-    with open(batching_config_file, "w") as f:
+    with open(batching_config_file, "w", encoding="utf8") as f:
         f.write(config)