Merge pull request #431 from rstudio/remove-capability-check

remove capability check

Author: mmarchetti

rsconnect/actions.py

@@ -272,19 +272,6 @@ def _to_sort_key(text):
     }
 
 
-def are_apis_supported_on_server(connect_details):
-    """
-    Returns whether or not the Connect server has Python itself enabled and its license allows
-    for API usage.  This controls whether APIs may be deployed..
-
-    :param connect_details: details about a Connect server as returned by gather_server_details()
-    :return: boolean True if the Connect server supports Python APIs or not or False if not.
-    :error: The Posit Connect server does not allow for Python APIs.
-    """
-    warn("This method has been moved and will be deprecated.", DeprecationWarning, stacklevel=2)
-    return connect_details["python"]["api_enabled"]
-
-
 def is_conda_supported_on_server(connect_details):
     """
     Returns whether or not conda is supported on a Connect server.
@@ -296,34 +283,6 @@ def is_conda_supported_on_server(connect_details):
     return connect_details.get("conda", {}).get("supported", False)
 
 
-def check_server_capabilities(connect_server, capability_functions, details_source=gather_server_details):
-    """
-    Uses a sequence of functions that check for capabilities in a Connect server.  The
-    server settings data is retrieved by the gather_server_details() function.
-
-    Each function provided must accept one dictionary argument which will be the server
-    settings data returned by the gather_server_details() function.  That function must
-    return a boolean value.  It must also contain a docstring which itself must contain
-    an ":error:" tag as the last thing in the docstring.  If the function returns False,
-    an exception is raised with the function's ":error:" text as its message.
-
-    :param connect_server: the information needed to interact with the Connect server.
-    :param capability_functions: a sequence of functions that will be called.
-    :param details_source: the source for obtaining server details, gather_server_details(),
-    by default.
-    """
-    details = details_source(connect_server)
-
-    for function in capability_functions:
-        if not function(details):
-            index = function.__doc__.find(":error:") if function.__doc__ else -1
-            if index >= 0:
-                message = function.__doc__[index + 7 :].strip()
-            else:
-                message = "The server does not satisfy the %s capability check." % function.__name__
-            raise RSConnectException(message)
-
-
 def _make_deployment_name(remote_server: api.TargetableServer, title: str, force_unique: bool) -> str:
     """
     Produce a name for a deployment based on its title.  It is assumed that the
@@ -830,7 +789,6 @@ def deploy_app(
     (
         ce.validate_server()
         .validate_app_mode(app_mode=app_mode)
-        .check_server_capabilities([are_apis_supported_on_server])
         .make_bundle(
             make_api_bundle,
             directory,

rsconnect/api.py

@@ -294,7 +294,6 @@ def get_content(self, content_guid):
     def wait_for_task(
         self, task_id, log_callback, abort_func=lambda: False, timeout=get_timeout(), poll_wait=0.5, raise_on_error=True
     ):
-
         last_status = None
         ending = time.time() + timeout if timeout else 999999999999
 
@@ -655,36 +654,6 @@ def make_bundle(self, func: Callable, *args, **kwargs):
 
         return self
 
-    def check_server_capabilities(self, capability_functions):
-        """
-        Uses a sequence of functions that check for capabilities in a Connect server.  The
-        server settings data is retrieved by the gather_server_details() function.
-
-        Each function provided must accept one dictionary argument which will be the server
-        settings data returned by the gather_server_details() function.  That function must
-        return a boolean value.  It must also contain a docstring which itself must contain
-        an ":error:" tag as the last thing in the docstring.  If the function returns False,
-        an exception is raised with the function's ":error:" text as its message.
-
-        :param capability_functions: a sequence of functions that will be called.
-        :param details_source: the source for obtaining server details, gather_server_details(),
-        by default.
-        """
-        if isinstance(self.remote_server, PositServer):
-            return self
-
-        details = self.server_details
-
-        for function in capability_functions:
-            if not function(details):
-                index = function.__doc__.find(":error:") if function.__doc__ else -1
-                if index >= 0:
-                    message = function.__doc__[index + 7 :].strip()
-                else:
-                    message = "The server does not satisfy the %s capability check." % function.__name__
-                raise RSConnectException(message)
-        return self
-
     def upload_rstudio_bundle(self, prepare_deploy_result, bundle_size: int, contents):
         upload_url = prepare_deploy_result.presigned_url
         parsed_upload_url = urlparse(upload_url)

rsconnect/bundle.py

@@ -1431,27 +1431,6 @@ def fake_module_file_from_directory(directory: str):
     return join(directory, app_name + ".py")
 
 
-def is_python_enabled_on_server(connect_details):
-    """
-    Returns whether or not the Connect server has Python itself enabled.
-
-    :error: The Posit Connect server does not have Python enabled.
-    """
-    return any(connect_details.get("python", {}).get("versions", []))
-
-
-def are_apis_supported_on_server(connect_details):
-    """
-    Returns whether or not the Connect server has Python itself enabled and its license allows
-    for API usage.  This controls whether APIs may be deployed..
-
-    :param connect_details: details about a Connect server as returned by gather_server_details()
-    :return: boolean True if the Connect server supports Python APIs or not or False if not.
-    :error: The Posit Connect server does not allow for Python APIs.
-    """
-    return connect_details["python"]["api_enabled"]
-
-
 def which_python(python: typing.Optional[str] = None):
     """Determines which Python executable to use.
 

rsconnect/main.py

@@ -40,8 +40,6 @@
 from . import api, VERSION, validation
 from .api import RSConnectExecutor, RSConnectServer, RSConnectClient, filter_out_server_info
 from .bundle import (
-    is_python_enabled_on_server,
-    are_apis_supported_on_server,
     create_python_environment,
     default_title_from_manifest,
     is_environment_dir,
@@ -1312,7 +1310,6 @@ def deploy_app(
         (
             ce.validate_server()
             .validate_app_mode(app_mode=app_mode)
-            .check_server_capabilities([is_python_enabled_on_server, are_apis_supported_on_server])
             .make_bundle(
                 make_api_bundle,
                 directory,

tests/test_actions.py

@@ -10,15 +10,12 @@
 
 from rsconnect.actions import (
     _verify_server,
-    are_apis_supported_on_server,
-    check_server_capabilities,
     create_api_deployment_bundle,
     create_notebook_deployment_bundle,
     deploy_dash_app,
     deploy_python_api,
     deploy_streamlit_app,
     deploy_bokeh_app,
-    is_conda_supported_on_server,
 )
 from rsconnect.api import RSConnectServer
 from rsconnect.environment import MakeEnvironment
@@ -36,39 +33,6 @@ def test_verify_server(self):
         with self.assertRaises(RSConnectException):
             _verify_server(RSConnectServer("fake-url", None))
 
-    def test_check_server_capabilities(self):
-        no_api_support = {"python": {"api_enabled": False}}
-        api_support = {"python": {"api_enabled": True}}
-
-        with self.assertRaises(RSConnectException) as context:
-            check_server_capabilities(None, (are_apis_supported_on_server,), lambda x: no_api_support)
-        self.assertEqual(
-            str(context.exception),
-            "The Posit Connect server does not allow for Python APIs.",
-        )
-
-        check_server_capabilities(None, (are_apis_supported_on_server,), lambda x: api_support)
-
-        no_conda = api_support
-        conda_not_supported = {"conda": {"supported": False}}
-        conda_supported = {"conda": {"supported": True}}
-
-        with self.assertRaises(RSConnectException) as context:
-            check_server_capabilities(None, (is_conda_supported_on_server,), lambda x: no_conda)
-        self.assertEqual(
-            str(context.exception),
-            "Conda is not supported on the target server.  " + "Try deploying without requesting Conda.",
-        )
-
-        with self.assertRaises(RSConnectException) as context:
-            check_server_capabilities(None, (is_conda_supported_on_server,), lambda x: conda_not_supported)
-        self.assertEqual(
-            str(context.exception),
-            "Conda is not supported on the target server.  " + "Try deploying without requesting Conda.",
-        )
-
-        check_server_capabilities(None, (is_conda_supported_on_server,), lambda x: conda_supported)
-
         # noinspection PyUnusedLocal
         def fake_cap(details):
             return False
@@ -78,20 +42,6 @@ def fake_cap_with_doc(details):
             """A docstring."""
             return False
 
-        with self.assertRaises(RSConnectException) as context:
-            check_server_capabilities(None, (fake_cap,), lambda x: None)
-        self.assertEqual(
-            str(context.exception),
-            "The server does not satisfy the fake_cap capability check.",
-        )
-
-        with self.assertRaises(RSConnectException) as context:
-            check_server_capabilities(None, (fake_cap_with_doc,), lambda x: None)
-        self.assertEqual(
-            str(context.exception),
-            "The server does not satisfy the fake_cap_with_doc capability check.",
-        )
-
     def test_deploy_python_api_validates(self):
         directory = get_api_path("flask")
         server = RSConnectServer("https://www.bogus.com", "bogus")