Restore tabpy_tools and tabpy_server names

CONTRIBUTING.md

@@ -15,7 +15,6 @@
 - [Documentation Updates](#documentation-updates)
 - [TabPy with Swagger](#tabpy-with-swagger)
 - [Code styling](#code-styling)
-- [Publishing TabPy Package](#publishing-tabpy-package)
 
 <!-- tocstop -->
 

docs/security.md

@@ -6,7 +6,7 @@ you may want to consider the following as you use TabPy:
 - The REST server and Python execution share the same Python session,
   meaning that HTTP requests and user scripts are evaluated in the
   same addressable memory and processor threads.
-- The tabpy.tools client does not perform client-side validation of the
+- The tabpy.tabpy_tools client does not perform client-side validation of the
   SSL certificate on TabPy Server.
 - Python scripts can contain code which can harm security on the server
   where the TabPy is running. For example, Python scripts can:

docs/tabpy-tools.md

@@ -30,7 +30,7 @@ to specify the service location for all subsequent operations:
 
 ```python
 
-from tabpy.tools.client import Client
+from tabpy.tabpy_tools.client import Client
 
 client = Client('http://localhost:9004/')
 
@@ -351,7 +351,7 @@ method provided in this tools package:
 
 ```python
 
-from tabpy.tools.schema import generate_schema
+from tabpy.tabpy_tools.schema import generate_schema
 
 schema = generate_schema(
   input={'x': 3, 'y': 2},
@@ -368,7 +368,7 @@ To describe more complex input, like arrays, you would use the following syntax:
 
 ```python
 
-from tabpy.tools.schema import generate_schema
+from tabpy.tabpy_tools.schema import generate_schema
 
 schema = generate_schema(
   input={'x': [6.35, 6.40, 6.65, 8.60],

tabpy/models/utils/setup_utils.py

@@ -2,14 +2,14 @@
 import getpass
 import os
 import sys
-from tabpy.tools.client import Client
+from tabpy.tabpy_tools.client import Client
 
 
 def get_default_config_file_path():
     import tabpy
 
     pkg_path = os.path.dirname(tabpy.__file__)
-    config_file_path = os.path.join(pkg_path, "server", "common", "default.conf")
+    config_file_path = os.path.join(pkg_path, "tabpy_server", "common", "default.conf")
     return config_file_path
 
 

tabpy/tabpy.py

@@ -38,7 +38,7 @@ def main():
     args = docopt.docopt(__doc__)
     config = args["--config"] or None
 
-    from tabpy.server.app.app import TabPyApp
+    from tabpy.tabpy_server.app.app import TabPyApp
 
     app = TabPyApp(config)
     app.run()

tabpy/utils/tabpy_user.py

@@ -19,8 +19,8 @@
 import docopt
 import logging
 import secrets
-from tabpy.server.app.util import parse_pwd_file
-from tabpy.server.handlers.util import hash_password
+from tabpy.tabpy_server.app.util import parse_pwd_file
+from tabpy.tabpy_server.handlers.util import hash_password
 
 logger = logging.getLogger(__name__)
 

tests/unit/server_tests/test_config.py

@@ -2,8 +2,8 @@
 import unittest
 from tempfile import NamedTemporaryFile
 import tabpy
-from tabpy.server.app.util import validate_cert
-from tabpy.server.app.app import TabPyApp
+from tabpy.tabpy_server.app.util import validate_cert
+from tabpy.tabpy_server.app.app import TabPyApp
 
 from unittest.mock import patch
 
@@ -22,11 +22,11 @@ def test_config_file_does_not_exist(self):
         self.assertEqual(app.settings["log_request_context"], False)
         self.assertEqual(app.settings["evaluate_timeout"], 30)
 
-    @patch("tabpy.server.app.app.TabPyState")
-    @patch("tabpy.server.app.app._get_state_from_file")
-    @patch("tabpy.server.app.app.PythonServiceHandler")
-    @patch("tabpy.server.app.app.os.path.exists", return_value=True)
-    @patch("tabpy.server.app.app.os")
+    @patch("tabpy.tabpy_server.app.app.TabPyState")
+    @patch("tabpy.tabpy_server.app.app._get_state_from_file")
+    @patch("tabpy.tabpy_server.app.app.PythonServiceHandler")
+    @patch("tabpy.tabpy_server.app.app.os.path.exists", return_value=True)
+    @patch("tabpy.tabpy_server.app.app.os")
     def test_no_config_file(
         self,
         mock_os,
@@ -37,7 +37,7 @@ def test_no_config_file(
     ):
         pkg_path = os.path.dirname(tabpy.__file__)
         obj_path = os.path.join(pkg_path, "tmp", "query_objects")
-        state_path = os.path.join(pkg_path, "server")
+        state_path = os.path.join(pkg_path, "tabpy_server")
         mock_os.environ = {
             "TABPY_PORT": "9004",
             "TABPY_QUERY_OBJECT_PATH": obj_path,
@@ -52,11 +52,11 @@ def test_no_config_file(
         self.assertTrue(len(mock_management_util.mock_calls) > 0)
         mock_os.makedirs.assert_not_called()
 
-    @patch("tabpy.server.app.app.TabPyState")
-    @patch("tabpy.server.app.app._get_state_from_file")
-    @patch("tabpy.server.app.app.PythonServiceHandler")
-    @patch("tabpy.server.app.app.os.path.exists", return_value=False)
-    @patch("tabpy.server.app.app.os")
+    @patch("tabpy.tabpy_server.app.app.TabPyState")
+    @patch("tabpy.tabpy_server.app.app._get_state_from_file")
+    @patch("tabpy.tabpy_server.app.app.PythonServiceHandler")
+    @patch("tabpy.tabpy_server.app.app.os.path.exists", return_value=False)
+    @patch("tabpy.tabpy_server.app.app.os")
     def test_no_state_ini_file_or_state_dir(
         self,
         mock_os,
@@ -77,11 +77,11 @@ def tearDown(self):
         os.remove(self.config_file.name)
         self.config_file = None
 
-    @patch("tabpy.server.app.app.TabPyState")
-    @patch("tabpy.server.app.app._get_state_from_file")
-    @patch("tabpy.server.app.app.PythonServiceHandler")
-    @patch("tabpy.server.app.app.os.path.exists", return_value=True)
-    @patch("tabpy.server.app.app.os")
+    @patch("tabpy.tabpy_server.app.app.TabPyState")
+    @patch("tabpy.tabpy_server.app.app._get_state_from_file")
+    @patch("tabpy.tabpy_server.app.app.PythonServiceHandler")
+    @patch("tabpy.tabpy_server.app.app.os.path.exists", return_value=True)
+    @patch("tabpy.tabpy_server.app.app.os")
     def test_config_file_present(
         self,
         mock_os,
@@ -116,9 +116,9 @@ def test_config_file_present(
         self.assertEqual(app.settings["log_request_context"], False)
         self.assertEqual(app.settings["evaluate_timeout"], 30)
 
-    @patch("tabpy.server.app.app.os.path.exists", return_value=True)
-    @patch("tabpy.server.app.app._get_state_from_file")
-    @patch("tabpy.server.app.app.TabPyState")
+    @patch("tabpy.tabpy_server.app.app.os.path.exists", return_value=True)
+    @patch("tabpy.tabpy_server.app.app._get_state_from_file")
+    @patch("tabpy.tabpy_server.app.app.TabPyState")
     def test_custom_evaluate_timeout_valid(
         self, mock_state, mock_get_state_from_file, mock_path_exists
     ):
@@ -130,9 +130,9 @@ def test_custom_evaluate_timeout_valid(
         app = TabPyApp(self.config_file.name)
         self.assertEqual(app.settings["evaluate_timeout"], 1996.0)
 
-    @patch("tabpy.server.app.app.os.path.exists", return_value=True)
-    @patch("tabpy.server.app.app._get_state_from_file")
-    @patch("tabpy.server.app.app.TabPyState")
+    @patch("tabpy.tabpy_server.app.app.os.path.exists", return_value=True)
+    @patch("tabpy.tabpy_server.app.app._get_state_from_file")
+    @patch("tabpy.tabpy_server.app.app.TabPyState")
     def test_custom_evaluate_timeout_invalid(
         self, mock_state, mock_get_state_from_file, mock_path_exists
     ):
@@ -146,10 +146,10 @@ def test_custom_evaluate_timeout_invalid(
         with self.assertRaises(ValueError):
             TabPyApp(self.config_file.name)
 
-    @patch("tabpy.server.app.app.os")
-    @patch("tabpy.server.app.app.os.path.exists", return_value=True)
-    @patch("tabpy.server.app.app._get_state_from_file")
-    @patch("tabpy.server.app.app.TabPyState")
+    @patch("tabpy.tabpy_server.app.app.os")
+    @patch("tabpy.tabpy_server.app.app.os.path.exists", return_value=True)
+    @patch("tabpy.tabpy_server.app.app._get_state_from_file")
+    @patch("tabpy.tabpy_server.app.app.TabPyState")
     def test_env_variables_in_config(
         self, mock_state, mock_get_state, mock_path_exists, mock_os
     ):
@@ -234,7 +234,7 @@ def test_https_without_key(self):
             "Error using HTTPS: The parameter(s) TABPY_KEY_FILE must be set."
         )
 
-    @patch("tabpy.server.app.app.os.path")
+    @patch("tabpy.tabpy_server.app.app.os.path")
     def test_https_cert_and_key_file_not_found(self, mock_path):
         self.fp.write(
             "[TabPy]\n"
@@ -251,7 +251,7 @@ def test_https_cert_and_key_file_not_found(self, mock_path):
             "TABPY_KEY_FILE must point to an existing file."
         )
 
-    @patch("tabpy.server.app.app.os.path")
+    @patch("tabpy.tabpy_server.app.app.os.path")
     def test_https_cert_file_not_found(self, mock_path):
         self.fp.write(
             "[TabPy]\n"
@@ -270,7 +270,7 @@ def test_https_cert_file_not_found(self, mock_path):
             "must point to an existing file."
         )
 
-    @patch("tabpy.server.app.app.os.path")
+    @patch("tabpy.tabpy_server.app.app.os.path")
     def test_https_key_file_not_found(self, mock_path):
         self.fp.write(
             "[TabPy]\n"
@@ -289,8 +289,8 @@ def test_https_key_file_not_found(self, mock_path):
             "must point to an existing file."
         )
 
-    @patch("tabpy.server.app.app.os.path.isfile", return_value=True)
-    @patch("tabpy.server.app.util.validate_cert")
+    @patch("tabpy.tabpy_server.app.app.os.path.isfile", return_value=True)
+    @patch("tabpy.tabpy_server.app.util.validate_cert")
     def test_https_success(self, mock_isfile, mock_validate_cert):
         self.fp.write(
             "[TabPy]\n"

tests/unit/server_tests/test_endpoint_file_manager.py

@@ -1,5 +1,5 @@
 import unittest
-from tabpy.server.common.endpoint_file_mgr import _check_endpoint_name
+from tabpy.tabpy_server.common.endpoint_file_mgr import _check_endpoint_name
 
 
 class TestEndpointFileManager(unittest.TestCase):

tests/unit/server_tests/test_endpoint_handler.py

@@ -3,9 +3,9 @@
 import sys
 import tempfile
 
-from tabpy.server.app.app import TabPyApp
-from tabpy.server.app.app import _init_asyncio_patch
-from tabpy.server.handlers.util import hash_password
+from tabpy.tabpy_server.app.app import TabPyApp
+from tabpy.tabpy_server.app.app import _init_asyncio_patch
+from tabpy.tabpy_server.handlers.util import hash_password
 from tornado.testing import AsyncHTTPTestCase
 
 

tests/unit/server_tests/test_endpoints_handler.py

@@ -2,8 +2,8 @@
 import os
 import tempfile
 
-from tabpy.server.app.app import TabPyApp
-from tabpy.server.handlers.util import hash_password
+from tabpy.tabpy_server.app.app import TabPyApp
+from tabpy.tabpy_server.handlers.util import hash_password
 from tornado.testing import AsyncHTTPTestCase
 
 

tests/unit/server_tests/test_evaluation_plane_handler.py

@@ -3,8 +3,8 @@
 import tempfile
 
 from argparse import Namespace
-from tabpy.server.app.app import TabPyApp
-from tabpy.server.handlers.util import hash_password
+from tabpy.tabpy_server.app.app import TabPyApp
+from tabpy.tabpy_server.handlers.util import hash_password
 from tornado.testing import AsyncHTTPTestCase
 
 

tests/unit/server_tests/test_pwd_file.py

@@ -2,7 +2,7 @@
 import unittest
 from tempfile import NamedTemporaryFile
 
-from tabpy.server.app.app import TabPyApp
+from tabpy.tabpy_server.app.app import TabPyApp
 
 
 class TestPasswordFile(unittest.TestCase):

tests/unit/server_tests/test_service_info_handler.py

@@ -1,8 +1,8 @@
 import base64
 import json
 import os
-from tabpy.server.app.app import TabPyApp
-from tabpy.server.app.SettingsParameters import SettingsParameters
+from tabpy.tabpy_server.app.app import TabPyApp
+from tabpy.tabpy_server.app.SettingsParameters import SettingsParameters
 import tempfile
 from tornado.testing import AsyncHTTPTestCase
 

tests/unit/tools_tests/test_client.py

@@ -1,8 +1,8 @@
 import unittest
 from unittest.mock import Mock
 
-from tabpy.tools.client import Client
-from tabpy.tools.client import _check_endpoint_name
+from tabpy.tabpy_tools.client import Client
+from tabpy.tabpy_tools.client import _check_endpoint_name
 
 
 class TestClient(unittest.TestCase):

tests/unit/tools_tests/test_rest.py

@@ -1,7 +1,7 @@
 import json
 import requests
 from requests.auth import HTTPBasicAuth
-from tabpy.tools.rest import RequestsNetworkWrapper, ServiceClient
+from tabpy.tabpy_tools.rest import RequestsNetworkWrapper, ServiceClient
 import unittest
 from unittest.mock import Mock
 

tests/unit/tools_tests/test_rest_object.py

@@ -1,7 +1,7 @@
 import unittest
 import sys
 
-from tabpy.tools.rest import RESTObject, RESTProperty, enum
+from tabpy.tabpy_tools.rest import RESTObject, RESTProperty, enum
 
 
 class TestRESTObject(unittest.TestCase):

tests/unit/tools_tests/test_schema.py

@@ -1,6 +1,6 @@
 import unittest
 
-from tabpy.tools.schema import generate_schema
+from tabpy.tabpy_tools.schema import generate_schema
 
 
 class TestSchema(unittest.TestCase):