run black

Author: Ziqun Ye

ads/opctl/conda/cmds.py

@@ -311,7 +311,9 @@ def _install(
     """
     ns, bucket, path, slug = parse_conda_uri(conda_uri)
     if bucket == "service-conda-packs":
-        raise ValueError("Download service conda pack is not allowed. Only custom conda pack can be downloaded to local machine. You need to publish it to your own bucket first.")
+        raise ValueError(
+            "Download service conda pack is not allowed. Only custom conda pack can be downloaded to local machine. You need to publish it to your own bucket first."
+        )
     os.makedirs(conda_pack_folder, exist_ok=True)
     pack_path = os.path.join(os.path.expanduser(conda_pack_folder), slug + ".tar.gz")
     pack_folder_path = os.path.join(os.path.expanduser(conda_pack_folder), slug)

ads/opctl/model/cli.py

@@ -19,18 +19,46 @@ def commands():
 
 @commands.command()
 @click.argument("ocid", required=True)
-@click.option("--model-save-folder", "-mf", nargs=1, required=False, default=DEFAULT_MODEL_FOLDER, help="Which location to store model artifact folders. Defaults to ~/.ads_ops/models. This is only used when model id is passed to `ocid` and a local predict is conducted.")
+@click.option(
+    "--model-save-folder",
+    "-mf",
+    nargs=1,
+    required=False,
+    default=DEFAULT_MODEL_FOLDER,
+    help="Which location to store model artifact folders. Defaults to ~/.ads_ops/models. This is only used when model id is passed to `ocid` and a local predict is conducted.",
+)
 @click.option(
     "--auth",
     "-a",
     help="authentication method",
     type=click.Choice(AuthType.values()),
     default=None,
 )
-@click.option("--bucket-uri", nargs=1, required=False, help="The OCI Object Storage URI where model artifacts will be copied to. The `bucket_uri` is only necessary for uploading large artifacts which size is greater than 2GB. Example: `oci://<bucket_name>@<namespace>/prefix/`. This is only used when the model id is passed.")
-@click.option("--region", nargs=1, required=False, help="The destination Object Storage bucket region. By default the value will be extracted from the `OCI_REGION_METADATA` environment variables. This is only used when the model id is passed.")
-@click.option("--timeout", nargs=1, required=False, help="The connection timeout in seconds for the client. This is only used when the model id is passed.")
-@click.option("--force-overwrite", "-f", help="Overwrite existing model.", is_flag=True, default=False)
+@click.option(
+    "--bucket-uri",
+    nargs=1,
+    required=False,
+    help="The OCI Object Storage URI where model artifacts will be copied to. The `bucket_uri` is only necessary for uploading large artifacts which size is greater than 2GB. Example: `oci://<bucket_name>@<namespace>/prefix/`. This is only used when the model id is passed.",
+)
+@click.option(
+    "--region",
+    nargs=1,
+    required=False,
+    help="The destination Object Storage bucket region. By default the value will be extracted from the `OCI_REGION_METADATA` environment variables. This is only used when the model id is passed.",
+)
+@click.option(
+    "--timeout",
+    nargs=1,
+    required=False,
+    help="The connection timeout in seconds for the client. This is only used when the model id is passed.",
+)
+@click.option(
+    "--force-overwrite",
+    "-f",
+    help="Overwrite existing model.",
+    is_flag=True,
+    default=False,
+)
 @click.option("--debug", "-d", help="set debug mode", is_flag=True, default=False)
 def download(**kwargs):
-    suppress_traceback(kwargs["debug"])(download_model_cmd)(**kwargs)
+    suppress_traceback(kwargs["debug"])(download_model_cmd)(**kwargs)

ads/opctl/model/cmds.py

@@ -19,41 +19,59 @@ def download_model(**kwargs):
     oci_auth = create_signer(
         auth_type,
         oci_config,
-        profile ,
+        profile,
+    )
+    model_folder = os.path.expanduser(
+        p.config["execution"].get("model_save_folder", DEFAULT_MODEL_FOLDER)
     )
-    model_folder = os.path.expanduser(p.config["execution"].get("model_save_folder", DEFAULT_MODEL_FOLDER))
     force_overwrite = p.config["execution"].get("force_overwrite", False)
-    
-    artifact_directory = os.path.join(model_folder, str(ocid))
-    if (not os.path.exists(artifact_directory) or len(os.listdir(artifact_directory)) == 0) or force_overwrite:
 
+    artifact_directory = os.path.join(model_folder, str(ocid))
+    if (
+        not os.path.exists(artifact_directory)
+        or len(os.listdir(artifact_directory)) == 0
+    ) or force_overwrite:
         region = p.config["execution"].get("region", None)
         bucket_uri = p.config["execution"].get("bucket_uri", None)
         timeout = p.config["execution"].get("timeout", None)
-        logger.info(f"No cached model found. Downloading the model {ocid} to {artifact_directory}. If you already have a copy of the model, specify `artifact_directory` instead of `ocid`. You can specify `model_save_folder` to decide where to store the model artifacts.")
-        _download_model(ocid=ocid, artifact_directory=artifact_directory, region=region, bucket_uri=bucket_uri, timeout=timeout, force_overwrite=force_overwrite, oci_auth=oci_auth)
+        logger.info(
+            f"No cached model found. Downloading the model {ocid} to {artifact_directory}. If you already have a copy of the model, specify `artifact_directory` instead of `ocid`. You can specify `model_save_folder` to decide where to store the model artifacts."
+        )
+        _download_model(
+            ocid=ocid,
+            artifact_directory=artifact_directory,
+            region=region,
+            bucket_uri=bucket_uri,
+            timeout=timeout,
+            force_overwrite=force_overwrite,
+            oci_auth=oci_auth,
+        )
     else:
         logger.error(f"Model already exists. Set `force_overwrite=True` to overwrite.")
-        raise ValueError(f"Model already exists. Set `force_overwrite=True` to overwrite.")
+        raise ValueError(
+            f"Model already exists. Set `force_overwrite=True` to overwrite."
+        )
 
 
-def _download_model(ocid, artifact_directory, oci_auth, region, bucket_uri, timeout, force_overwrite):
+def _download_model(
+    ocid, artifact_directory, oci_auth, region, bucket_uri, timeout, force_overwrite
+):
     os.makedirs(artifact_directory, exist_ok=True)
     os.chmod(artifact_directory, 777)
-    
+
     try:
         dsc_model = DataScienceModel.from_id(ocid)
         dsc_model.download_artifact(
-        target_dir=artifact_directory,
-        force_overwrite=force_overwrite,
-        overwrite_existing_artifact=True,
-        remove_existing_artifact=True,
-        auth=oci_auth,
-        region=region,
-        timeout=timeout,
-        bucket_uri=bucket_uri,
+            target_dir=artifact_directory,
+            force_overwrite=force_overwrite,
+            overwrite_existing_artifact=True,
+            remove_existing_artifact=True,
+            auth=oci_auth,
+            region=region,
+            timeout=timeout,
+            bucket_uri=bucket_uri,
         )
     except Exception as e:
         print(type(e))
         shutil.rmtree(artifact_directory, ignore_errors=True)
-        raise e
+        raise e

ads/opctl/script.py

@@ -7,18 +7,23 @@
 
 def verify(artifact_dir, data, compartment_id, project_id):
     with tempfile.TemporaryDirectory() as td:
-        model = GenericModel.from_model_artifact(uri = artifact_dir, artifact_dir=artifact_dir,
-                                                force_overwrite=True,
-                                                compartment_id=compartment_id,
-                                                project_id=project_id)
+        model = GenericModel.from_model_artifact(
+            uri=artifact_dir,
+            artifact_dir=artifact_dir,
+            force_overwrite=True,
+            compartment_id=compartment_id,
+            project_id=project_id,
+        )
 
         data = json.loads(data)
         print(model.verify(data, auto_serialize_data=False))
 
 
 def main():
     args = sys.argv[1:]
-    verify(artifact_dir = args[0], data=args[1], compartment_id=args[2], project_id=args[3])
+    verify(
+        artifact_dir=args[0], data=args[1], compartment_id=args[2], project_id=args[3]
+    )
     return 0