WIP

Author: jmoens

tabpy/tabpy_server/handlers/management_handler.py

@@ -84,7 +84,7 @@ def _add_or_update_endpoint(self, action, name, version, request_data):
             target = request_data.get("target", None)
             schema = request_data.get("schema", None)
             src_path = request_data.get("src_path", None)
-            isPublic = request_data.get("isPublic", None)
+            is_public = request_data.get("is_public", None)
             target_path = get_query_object_path(
                 self.settings[SettingsParameters.StateFilePath], name, version
             )
@@ -118,7 +118,7 @@ def _add_or_update_endpoint(self, action, name, version, request_data):
                         dependencies=dependencies,
                         target=target,
                         schema=schema,
-                        isPublic=isPublic,
+                        is_public=is_public,
                     )
                 else:
                     self.tabpy_state.update_endpoint(
@@ -131,7 +131,7 @@ def _add_or_update_endpoint(self, action, name, version, request_data):
                         target=target,
                         schema=schema,
                         version=version,
-                        isPublic=isPublic,
+                        is_public=is_public,
                     )
 
             except Exception as e:

tabpy/tabpy_server/management/state.py

@@ -187,11 +187,11 @@ def _check_and_set_dependencies(self, dependencies, defaultValue):
 
         return dependencies
 
-    def _check_and_set_is_public(self, isPublic, defaultValue):
-        if isPublic is None:
+    def _check_and_set_is_public(self, is_public, defaultValue):
+        if is_public is None:
             return defaultValue
 
-        return isPublic
+        return is_public
 
     @state_lock
     def add_endpoint(
@@ -204,7 +204,7 @@ def add_endpoint(
         target=None,
         dependencies=None,
         schema=None,
-        isPublic=None,
+        is_public=None,
     ):
         """
         Add a new endpoint to the TabPy.
@@ -238,7 +238,7 @@ def add_endpoint(
                 docstring, "-- no docstring found in query function --")
             endpoint_type = self._check_and_set_endpoint_type(endpoint_type, None)
             dependencies = self._check_and_set_dependencies(dependencies, [])
-            isPublic = self._check_and_set_is_public(isPublic, False)
+            is_public = self._check_and_set_is_public(is_public, False)
 
             self._check_target(target)
             if target and target not in endpoints:
@@ -254,7 +254,7 @@ def add_endpoint(
                 "creation_time": int(time()),
                 "last_modified_time": int(time()),
                 "schema": schema,
-                "isPublic": isPublic,
+                "is_public": is_public,
             }
 
             endpoints[name] = endpoint_info
@@ -298,7 +298,7 @@ def update_endpoint(
         target=None,
         dependencies=None,
         schema=None,
-        isPublic=None,
+        is_public=None,
     ):
         """
         Update an existing endpoint on the TabPy.
@@ -340,7 +340,7 @@ def update_endpoint(
                 endpoint_type, endpoint_info["type"])
             dependencies = self._check_and_set_dependencies(
                 dependencies, endpoint_info.get("dependencies", []))
-            isPublic = self._check_and_set_is_public(isPublic, endpoint_info["isPublic"])
+            is_public = self._check_and_set_is_public(is_public, endpoint_info["is_public"])
 
             self._check_target(target)
             if target and target not in endpoints:
@@ -363,7 +363,7 @@ def update_endpoint(
                 "creation_time": endpoint_info["creation_time"],
                 "last_modified_time": int(time()),
                 "schema": schema,
-                "isPublic": isPublic,
+                "is_public": is_public,
             }
 
             endpoints[name] = endpoint_info
@@ -455,7 +455,7 @@ def make_endpoint_public(self, name):
 
         self.update_endpoint(
             name,
-            isPublic=True
+            is_public=True
         )
 
     @property

tabpy/tabpy_tools/client.py

@@ -174,7 +174,7 @@ def get_endpoints(self, type=None):
                "last_modified_time": 1469511182,
                "type": "model",
                "target": null,
-               "isPublic": True}
+               "is_public": True}
             "add": {
               "description": "",
               "docstring": "-- no docstring found in query function --",
@@ -184,7 +184,7 @@ def get_endpoints(self, type=None):
               "last_modified_time": 1469505967,
               "type": "model",
               "target": null,
-              "isPublic": False}
+              "is_public": False}
             }
         """
         return self._service.get_endpoints(type)
@@ -193,7 +193,7 @@ def _get_endpoint_upload_destination(self):
         """Returns the endpoint upload destination."""
         return self._service.get_endpoint_upload_destination()["path"]
 
-    def deploy(self, name, obj, description="", schema=None, override=False, isPublic=False):
+    def deploy(self, name, obj, description="", schema=None, override=False, is_public=False):
         """Deploys a Python function as an endpoint in the server.
 
         Parameters
@@ -222,7 +222,7 @@ def deploy(self, name, obj, description="", schema=None, override=False, isPubli
             RuntimeError. If True and there is already an endpoint with that
             name, it will deploy a new version on top of it.
 
-        isPublic : bool, optional
+        is_public : bool, optional
             Whether a function should be public for viewing from within tableau. If
             False, function will not appear in the custom functions explorer within
             Tableau. If True, function will be visible ta anyone on a site with this
@@ -244,7 +244,7 @@ def deploy(self, name, obj, description="", schema=None, override=False, isPubli
 
             version = endpoint.version + 1
 
-        obj = self._gen_endpoint(name, obj, description, version, schema, isPublic)
+        obj = self._gen_endpoint(name, obj, description, version, schema, is_public)
 
         self._upload_endpoint(obj)
 
@@ -272,9 +272,10 @@ def make_public(self, name):
         name : str
             Endpoint name to make public'''
 
-        self._service.make_public(name)
+        endpoint = self.get_endpoints().get(name)
+        self._service.make_public(endpoint)
 
-    def _gen_endpoint(self, name, obj, description, version=1, schema=None, isPublic=False):
+    def _gen_endpoint(self, name, obj, description, version=1, schema=None, is_public=False):
         """Generates an endpoint dict.
 
         Parameters
@@ -292,7 +293,7 @@ def _gen_endpoint(self, name, obj, description, version=1, schema=None, isPublic
         version : int
             The version. Defaults to 1.
 
-        isPublic : bool
+        is_public : bool
             True if function should be visible in the custom functions explorer
             within Tableau
 
@@ -340,7 +341,7 @@ def _gen_endpoint(self, name, obj, description, version=1, schema=None, isPublic
             "required_files": [],
             "required_packages": [],
             "schema": copy.copy(schema),
-            "isPublic": isPublic,
+            "is_public": is_public,
         }
 
     def _upload_endpoint(self, obj):

tabpy/tabpy_tools/rest_client.py

@@ -47,7 +47,7 @@ class Endpoint(RESTObject):
     evaluator = RESTProperty(str)
     schema_version = RESTProperty(int)
     schema = RESTProperty(str)
-    isPublic = RESTProperty(bool)
+    is_public = RESTProperty(bool)
 
     def __new__(cls, **kwargs):
         """Dispatch to the appropriate class."""
@@ -68,7 +68,7 @@ def __eq__(self, other):
             and self.evaluator == other.evaluator
             and self.schema_version == other.schema_version
             and self.schema == other.schema
-            and self.isPublic == other.isPublic
+            and self.is_public == other.is_public
         )
 
 
@@ -216,17 +216,17 @@ def set_endpoint(self, endpoint):
         """
         return self.service_client.PUT("endpoints/" + endpoint.name, endpoint.to_json())
 
-    def make_public(self, endpoint_name):
+    def make_public(self, endpoint):
         """Updates an existing endpoint to be public.
 
         Parameters
         ----------
 
-        endpoint_name : str
+        endpoint : Endpoint
 
-            The name of the endpoint.
+            The endpoint to make public.
         """
-        self.service_client.PUT("endpoints/" + endpoint_name)
+        self.service_client.PUT("endpoints/" + endpoint.name, endpoint.to_json())
 
     def remove_endpoint(self, endpoint_name):
         """Deletes an endpoint through the management API.