Refactor /info response (#514)

Moved evaluate_enabled flag inside features field Co-authored-by: Chinmay Gore <[email protected]>
tableau · Aug 6, 2021 · c6fc744 · c6fc744
1 parent bc2c020
commit c6fc744
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/tabpy/tabpy_server/app/app.py b/tabpy/tabpy_server/app/app.py
@@ -416,6 +416,7 @@ def _get_features(self):
                 "methods": {"basic-auth": {}},
             }
 
+        features["evaluate_enabled"] = self.settings[SettingsParameters.EvaluateEnabled]
         return features
 
     def _build_tabpy_state(self):

diff --git a/tabpy/tabpy_server/handlers/service_info_handler.py b/tabpy/tabpy_server/handlers/service_info_handler.py
@@ -20,5 +20,4 @@ def get(self):
         info["server_version"] = self.settings[SettingsParameters.ServerVersion]
         info["name"] = self.tabpy_state.name
         info["versions"] = self.settings[SettingsParameters.ApiVersions]
-        info["evaluate_enabled"] = self.settings[SettingsParameters.EvaluateEnabled]
         self.write(json.dumps(info))
diff --git a/tests/unit/server_tests/test_service_info_handler.py b/tests/unit/server_tests/test_service_info_handler.py
@@ -14,8 +14,7 @@ def _create_expected_info_response(settings, tabpy_state):
         "state_path": settings["state_file_path"],
         "server_version": settings[SettingsParameters.ServerVersion],
         "name": tabpy_state.name,
-        "versions": settings["versions"],
-        "evaluate_enabled": settings["evaluate_enabled"]
+        "versions": settings["versions"]
     }
 
 
@@ -101,10 +100,9 @@ def test_given_server_with_auth_expect_correct_info_response(self):
         self.assertTrue("features" in v1)
         features = v1["features"]
         self.assertDictEqual(
-            {"authentication": {"methods": {"basic-auth": {}}, "required": True}},
+            {"authentication": {"methods": {"basic-auth": {}}, "required": True}, 'evaluate_enabled': True},
             features,
         )
-        self.assertTrue(actual_response['evaluate_enabled'])
 
 
 class TestServiceInfoHandlerWithoutAuth(BaseTestServiceInfoHandler):
@@ -128,8 +126,7 @@ def test_server_with_no_auth_expect_correct_info_response(self):
         v1 = versions["v1"]
         self.assertTrue("features" in v1)
         features = v1["features"]
-        self.assertDictEqual({}, features)
-        self.assertTrue(actual_response['evaluate_enabled'])
+        self.assertDictEqual({'evaluate_enabled': True}, features)
 
     def test_given_server_with_no_auth_and_password_expect_correct_info_response(self):
         header = {