Cleanup submitter code (#2847)

* Remove hdfs params in Python

* fomat code

* Cleanup submitter code

Author: lhw362950217

python/runtime/alisa/submitter.py

@@ -161,7 +161,7 @@ def submit_alisa_train(datasource, estimator_string, select, validation_select,
 
     Args:
         datasource: string
-            Like: odps://access_id:access_key@service.com/api?
+            Like: alisa://access_id:access_key@service.com/api?
                 curr_project=test_ci&scheme=http
         estimator_string: string
             Tensorflow estimator name, Keras class name, or XGBoost

python/runtime/pai/submitter.py

@@ -132,18 +132,15 @@ def get_oss_model_url(model_full_path):
     return "oss://%s/%s" % (oss.SQLFLOW_MODELS_BUCKET, model_full_path)
 
 
-def parse_maxcompute_dsn(datasource):
-    return MaxComputeConnection.get_uri_parts(datasource)
-
-
 def drop_pai_model(datasource, model_name):
     """Drop PAI model
 
     Args:
         datasource: current datasource
         model_name: name of the model to drop
     """
-    user, passwd, address, database = parse_maxcompute_dsn(datasource)
+    user, passwd, address, database = MaxComputeConnection.get_uri_parts(
+        datasource)
     cmd = "drop offlinemodel if exists %s" % model_name
     subprocess.run([
         "odpscmd", "-u", user, "-p", passwd, "--project", database,
@@ -220,7 +217,8 @@ def submit_pai_task(pai_cmd, datasource):
         pai_cmd: The command to submit
         datasource: The datasource this cmd will manipulate
     """
-    user, passwd, address, project = parse_maxcompute_dsn(datasource)
+    user, passwd, address, project = MaxComputeConnection.get_uri_parts(
+        datasource)
     cmd = [
         "odpscmd", "--instance-priority", "9", "-u", user, "-p", passwd,
         "--project", project, "--endpoint", address, "-e", pai_cmd
@@ -234,22 +232,18 @@ def submit_pai_task(pai_cmd, datasource):
 def get_oss_model_save_path(datasource, model_name):
     if not model_name:
         return None
-    user, _, _, project = parse_maxcompute_dsn(datasource)
+    user, _, _, project = MaxComputeConnection.get_uri_parts(datasource)
     user = user or "unknown"
     return "/".join([project, user, model_name])
 
 
-def get_datasource_dsn(datasource):
-    return datasource.split("://")[1]
-
-
 def get_project(datasource):
     """Get the project info from given datasource
 
     Args:
         datasource: The odps url to extract project
     """
-    _, _, _, project = parse_maxcompute_dsn(datasource)
+    _, _, _, project = MaxComputeConnection.get_uri_parts(datasource)
     return project
 
 

python/runtime/pai/submitter_test.py

@@ -27,16 +27,6 @@ def test_get_oss_model_url(self):
         url = submitter.get_oss_model_url("user_a/model")
         self.assertEqual("oss://sqlflow-models/user_a/model", url)
 
-    def test_get_datasource_dsn(self):
-        ds = "odps://access_id:access_key@service.com/api?" \
-             "curr_project=test_ci&scheme=http"
-        expected_dsn = "access_id:access_key@service.com/api?" \
-                       "curr_project=test_ci&scheme=http"
-        dsn = submitter.get_datasource_dsn(ds)
-        self.assertEqual(expected_dsn, dsn)
-        project = "test_ci"
-        self.assertEqual(project, submitter.get_project(ds))
-
     def test_get_pai_tf_cmd(self):
         conf = get_cluster_config({})
         os.environ[