Fix/jupyter sftp port discovery

mig/shared/functionality/reqjupyterservice.py

@@ -1,3 +1,3 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
@@ -20,7 +20,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 # -- END_HEADER ---
 #
@@ -52,10 +52,14 @@
 import time
 import shutil
 import random
-import requests
+try:
+    import requests
+except ImportError as err:
+    requests = None
 
 from mig.shared import returnvalues
 from mig.shared.base import client_id_dir, extract_field
+from mig.shared.conf import get_configuration_object
 from mig.shared.defaults import session_id_bytes
 from mig.shared.fileio import make_symlink, pickle, unpickle, write_file, \
     delete_symlink, delete_file
@@ -68,6 +72,18 @@
     get_workflow_session_id
 
 
+def __bail_out_requests(*args, **kwargs):
+    """Helper for dynamic bail out on actual use"""
+    raise Exception("jupyter functions require requests")
+
+
+def __require_requests(func):
+    """Internal helper to verify requests module availability on use"""
+    if requests is None:
+        return __bail_out_requests
+    return func
+
+
 def is_active(pickle_state, timeout=7200):
     """
     :param pickle_state: expects a pickle object dictionary that
@@ -77,7 +93,7 @@
     default is 2 hours -> 7200 seconds
     :return: Boolean
     """
     assert isinstance(pickle_state, dict), "pickle_state is a dictionary: %r" % \
                                            pickle_state
     assert 'CREATED_TIMESTAMP' in pickle_state
 
@@ -99,7 +115,7 @@
     if not isinstance(input_str, basestring) or not input_str:
         return None
     input_str = input_str.lower()
     valid_unix_name = "".join(re.findall('[a-z0-9_.\-]+', input_str))
     if not valid_unix_name:
         return None
     return valid_unix_name[:32]
@@ -118,8 +134,8 @@
     if "@" in mount_string and ":" in mount_string:
         # Expects that the mount_string is in the format
         # @mount_url:mount_path
         target_host = mount_string[mount_string.index("@")+1:mount_string.index(":")]
         target_path = mount_string[mount_string.index(":")+1:]        
 
     mount = {
         'targetHost': target_host,
@@ -212,14 +228,14 @@
             old_mounts.append(mount)
     return latest, old_mounts
 
-
+@__require_requests
 def get_host_from_service(configuration, service, base_url=None):
     """
     Returns a URL from one of the services available hosts,
     if no active host is found None is returned.
     :param configuration: The MiG Configuration object
     :param service: A service object that an active hosts should be found from
     :param base_url: An optional postfix URL path that will be appended to the selected service host
     when trying to connect to the service.
     :return: url string or None
     """
@@ -318,7 +334,7 @@
     }
     return ['', defaults]
 
-
+@__require_requests
 def main(client_id, user_arguments_dict):
     """Main function used by front end"""
     (configuration, logger, output_objects, op_name) = \
@@ -350,12 +366,7 @@
             {'object_type': 'error_text', 'text':
              'The required sftp service is not enabled on the system'})
         return (output_objects, returnvalues.SYSTEM_ERROR)
-
-    if configuration.site_enable_sftp:
-        sftp_port = configuration.user_sftp_port
-
-    if configuration.site_enable_sftp_subsys:
-        sftp_port = configuration.user_sftp_subsys_port
+    sftp_port = configuration.user_sftp_show_port
 
     requested_service = accepted['service'][-1]
     service = {k: v for options in configuration.jupyter_services
@@ -381,7 +392,7 @@
         )
         return (output_objects, returnvalues.SYSTEM_ERROR)
 
     host = get_host_from_service(configuration, service, base_url="/%s" % service["service_name"])
     # Get an active jupyterhost
     if not host:
         logger.error("No active jupyterhub host could be found")
@@ -494,7 +505,7 @@
                 workflow_session_id = get_workflow_session_id(configuration,
                                                               client_id)
                 if not workflow_session_id:
                     workflow_session_id = create_workflow_session_id(configuration,
                                                                      client_id)
                 # TODO get these dynamically
                 workflows_url = configuration.migserver_https_sid_url + \
@@ -653,7 +664,6 @@
 
 
 if __name__ == "__main__":
-    from mig.shared.conf import get_configuration_object
     if not os.environ.get('MIG_CONF', ''):
         conf_path = os.path.join(os.path.dirname(sys.argv[0]),
                                  '..', '..', 'server', 'MiGserver.conf')