python formatting and remove s from scala non formatted string

Author: david-zlai

api/py/ai/chronon/repo/run.py

@@ -214,9 +214,7 @@ def download_jar(
         spark_version="2.4.0",
         skip_download=False,
 ):
-    assert (
-        spark_version in SUPPORTED_SPARK
-    ), f"Received unsupported spark version {spark_version}. Supported spark versions are {SUPPORTED_SPARK}"
+    assert (spark_version in SUPPORTED_SPARK), f"Received unsupported spark version {spark_version}. Supported spark versions are {SUPPORTED_SPARK}"
     scala_version = SCALA_VERSION_FOR_SPARK[spark_version]
     maven_url_prefix = os.environ.get("CHRONON_MAVEN_MIRROR_PREFIX", None)
     default_url_prefix = (
@@ -372,8 +370,7 @@ def set_runtime_env(params):
                     for k in [
                         "chronon",
                         conf_type,
-                        params["mode"].replace(
-                            "-", "_") if params["mode"] else None,
+                        params["mode"].replace("-", "_") if params["mode"] else None,
                     ]
                     if k is not None
                 ]
@@ -432,9 +429,7 @@ def __init__(self, args, jar_path):
                 raise e
             possible_modes = list(
                 ROUTES[self.conf_type].keys()) + UNIVERSAL_ROUTES
-            assert (
-                args["mode"] in possible_modes
-            ), "Invalid mode:{} for conf:{} of type:{}, please choose from {}".format(
+            assert (args["mode"] in possible_modes), "Invalid mode:{} for conf:{} of type:{}, please choose from {}".format(
                 args["mode"], self.conf, self.conf_type, possible_modes
             )
         else:
@@ -518,9 +513,7 @@ def run(self):
                             )
                         )
                         if self.mode == "streaming":
-                            assert (
-                                len(filtered_apps) == 1
-                            ), "More than one found, please kill them all"
+                            assert (len(filtered_apps) == 1), "More than one found, please kill them all"
                             print("All good. No need to start a new app.")
                             return
                         elif self.mode == "streaming-client":
@@ -556,10 +549,7 @@ def run(self):
                         )
                         for start_ds, end_ds in date_ranges:
                             if not self.dataproc:
-                                command = (
-                                    "bash {script} --class ai.chronon.spark.Driver {jar} {subcommand} {args} "
-                                    + "{additional_args}"
-                                ).format(
+                                command = ("bash {script} --class ai.chronon.spark.Driver {jar} {subcommand} {args} " + "{additional_args}").format(
                                     script=self.spark_submit,
                                     jar=self.jar_path,
                                     subcommand=ROUTES[self.conf_type][self.mode],
@@ -593,9 +583,6 @@ def run(self):
                                 if self.conf:
                                     local_files_to_upload_to_gcs.append(
                                         self.conf)
-                                # upload teams.json to gcs
-                                local_files_to_upload_to_gcs.append(
-                                    get_teams_json_file_path(self.repo))
 
                                 dataproc_command = generate_dataproc_submitter_args(
                                     local_files_to_upload_to_gcs=[self.conf],
@@ -608,8 +595,8 @@ def run(self):
                     else:
                         if not self.dataproc:
                             command = (
-                                "bash {script} --class ai.chronon.spark.Driver {jar} {subcommand} {args} " +
-                                "{additional_args}"
+                                    "bash {script} --class ai.chronon.spark.Driver {jar} {subcommand} {args} " +
+                                    "{additional_args}"
                             ).format(
                                 script=self.spark_submit,
                                 jar=self.jar_path,
@@ -641,10 +628,6 @@ def run(self):
                             if self.conf:
                                 local_files_to_upload_to_gcs.append(self.conf)
 
-                            # upload teams.json to gcs
-                            local_files_to_upload_to_gcs.append(
-                                get_teams_json_file_path(self.repo))
-
                             dataproc_command = generate_dataproc_submitter_args(
                                 # for now, self.conf is the only local file that requires uploading to gcs
                                 local_files_to_upload_to_gcs=local_files_to_upload_to_gcs,
@@ -677,7 +660,7 @@ def _gen_final_args(self, start_ds=None, end_ds=None, override_conf_path=None):
         )
 
         final_args = base_args + " " + \
-            str(self.args) + override_start_partition_arg
+                     str(self.args) + override_start_partition_arg
 
         return final_args
 
@@ -692,8 +675,8 @@ def split_date_range(start_date, end_date, parallelism):
     if start_date > end_date:
         raise ValueError("Start date should be earlier than end date")
     total_days = (
-        end_date - start_date
-    ).days + 1  # +1 to include the end_date in the range
+                         end_date - start_date
+                 ).days + 1  # +1 to include the end_date in the range
 
     # Check if parallelism is greater than total_days
     if parallelism > total_days:

cloud_gcp/src/main/scala/ai/chronon/integrations/cloud_gcp/DataprocSubmitter.scala

@@ -189,7 +189,7 @@ object DataprocSubmitter {
     val bigtableInstanceId = sys.env.getOrElse("GCP_BIGTABLE_INSTANCE_ID", "")
 
     val gcpArgsToPass = Array.apply(
-      s"--is-gcp",
+      "--is-gcp",
       s"--gcp-project-id=${projectId}",
       s"--gcp-bigtable-instance-id=$bigtableInstanceId"
     )