Merge commit 'fa32b6a37eca61a9eae08a8ac71ddd525b06d5b3' from main

Author: qiuosier

ads/common/oci_logging.py

@@ -533,7 +533,7 @@ def _search_and_format(
         time_end: datetime.datetime = None,
         limit: int = LOG_RECORDS_LIMIT,
         sort_by: str = "datetime",
-        sort_order: str = SortOrder.DESC,
+        sort_order: str = SortOrder.ASC,
         log_filter: str = None,
     ):
         """Returns the formatted log records.
@@ -550,7 +550,7 @@ def _search_and_format(
             Maximum number of records to be returned.
         sort_by: (str, optional). Defaults to "datetime"
             The field for sorting the logs.
-        sort_order: (str, optional). Defaults to "DESC".
+        sort_order: (str, optional). Defaults to "ASC".
             The sort order for the log records. Can be "ASC" or "DESC".
         log_filter : (str, optional). Defaults to None.
             Expression for filtering the logs.
@@ -574,8 +574,8 @@ def _search_and_format(
             sort_order=sort_order,
             log_filter=log_filter,
         )
-        logs = sorted((log.data for log in logs), key=lambda x: x.get("datetime"))
-        logs = [log.get("logContent", {}) for log in logs]
+
+        logs = [log.data.get("logContent", {}) for log in logs]
         return [
             {
                 "id": log.get("id"),
@@ -617,7 +617,7 @@ def tail(
         return self._search_and_format(
             source=source,
             limit=limit,
-            sort_order=SortOrder.DESC,
+            sort_order=SortOrder.ASC,
             time_start=time_start,
             log_filter=log_filter,
         )
@@ -808,7 +808,7 @@ def stream(
                 logs = self._search_and_format(
                     source=source,
                     limit=None,
-                    sort_order=SortOrder.DESC,
+                    sort_order=SortOrder.ASC,
                     time_start=time_start,
                     log_filter=log_filter,
                 )
@@ -858,7 +858,7 @@ def tail(
             self._search_and_format(
                 source=source,
                 limit=limit,
-                sort_order=SortOrder.DESC,
+                sort_order=SortOrder.ASC,
                 time_start=time_start,
                 log_filter=log_filter,
             )
@@ -927,7 +927,7 @@ def search(
         time_end: datetime.datetime = None,
         limit: int = None,
         sort_by: str = "datetime",
-        sort_order: str = SortOrder.DESC,
+        sort_order: str = SortOrder.ASC,
         log_filter: str = None,
     ) -> List[oci.loggingsearch.models.SearchResult]:
         """Searches raw logs.
@@ -951,7 +951,7 @@ def search(
             Defaults to "datetime"
         sort_order : str, optional.
             The sort order for the log records. Can be "ASC" or "DESC".
-            Defaults to "DESC".
+            Defaults to "ASC".
         log_filter : str, optional
             Expression for filtering the logs. This will be the WHERE clause of the query.
             Defaults to None.
@@ -979,7 +979,7 @@ def _search_and_format(
         time_end: datetime.datetime = None,
         limit: int = LOG_RECORDS_LIMIT,
         sort_by: str = "datetime",
-        sort_order: str = SortOrder.DESC,
+        sort_order: str = SortOrder.ASC,
         log_filter: str = None,
         need_format: bool = True,
     ) -> List[Union[oci.loggingsearch.models.SearchResult, dict]]:
@@ -1005,7 +1005,7 @@ def _search_and_format(
             Defaults to "datetime"
         sort_order : str, optional.
             The sort order for the log records. Can be "ASC" or "DESC".
-            Defaults to "DESC".
+            Defaults to "ASC".
         log_filter : str, optional
             Expression for filtering the logs. This will be the WHERE clause of the query.
             Defaults to None.
@@ -1039,12 +1039,6 @@ def _search_and_format(
                 )
             )
 
-        # _collect_logs returns a list of either dict or oci.loggingsearch.models.SearchResult
-        # objects based on `need_format` parameter, so below there are two cases for log sorting.
-        if need_format:
-            batch_logs.sort(key=lambda x: x.get("datetime"))
-        else:
-            batch_logs.sort(key=lambda x: x.data.get("datetime"))
         if limit and len(batch_logs) > limit:
             batch_logs = batch_logs[:limit]
         return batch_logs
@@ -1057,7 +1051,7 @@ def _collect_logs(
         time_end: datetime.datetime = None,
         limit: int = LOG_RECORDS_LIMIT,
         sort_by: str = "datetime",
-        sort_order: str = SortOrder.DESC,
+        sort_order: str = SortOrder.ASC,
         log_filter: str = None,
         need_format: bool = True,
     ) -> List[Union[oci.loggingsearch.models.SearchResult, dict]]:
@@ -1085,7 +1079,7 @@ def _collect_logs(
             Defaults to "datetime"
         sort_order : str, optional.
             The sort order for the log records. Can be "ASC" or "DESC".
-            Defaults to "DESC".
+            Defaults to "ASC".
         log_filter : str, optional
             Expression for filtering the logs. This will be the WHERE clause of the query.
             Defaults to None.

ads/common/utils.py

@@ -71,7 +71,7 @@
 MAX_DISPLAY_VALUES = 10
 
 # par link of the index json file.
-PAR_LINK = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/Ri7zFc_h91sxMdgnza9Qnqw3Ina8hf8wzDvEpAnUXMDOnUR1U1fpsaBUjUfgPgIq/n/ociodscdev/b/service-conda-packs/o/service_pack/index.json"
+PAR_LINK = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/WyjtfVIG0uda-P3-2FmAfwaLlXYQZbvPZmfX1qg0-sbkwEQO6jpwabGr2hMDBmBp/n/ociodscdev/b/service-conda-packs/o/service_pack/index.json"
 
 random_state = 42
 test_size = 0.3

ads/model/runtime/utils.py

@@ -111,7 +111,7 @@ def _get_index_json_through_bucket(
     bucketname: str
         The Object Storage bucketname.
     auth: (Dict, optional). Defaults to None.
-        The default authetication is set using `ads.set_auth` API. If you need to override the
+        The default authentication is set using `ads.set_auth` API. If you need to override the
         default, use the `ads.common.auth.api_keys` or `ads.common.auth.resource_principal` to create appropriate
         authentication signer and kwargs required to instantiate IdentityClient object.
 
@@ -147,7 +147,7 @@ def get_service_packs(
     bucketname: str
         bucketname of the service pack.
     auth: (Dict, optional). Defaults to None.
-        The default authetication is set using `ads.set_auth` API. If you need to override the
+        The default authentication is set using `ads.set_auth` API. If you need to override the
         default, use the `ads.common.auth.api_keys` or `ads.common.auth.resource_principal` to create appropriate
         authentication signer and kwargs required to instantiate IdentityClient object.
 

ads/opctl/conda/cmds.py

@@ -46,6 +46,7 @@
 from ads.opctl.config.base import ConfigProcessor
 from ads.opctl.config.merger import ConfigMerger
 from ads.opctl.conda.multipart_uploader import MultiPartUploader
+import tempfile
 
 
 def _fetch_manifest_template() -> Dict:
@@ -108,6 +109,7 @@ def _create(
     conda_pack_folder: str,
     gpu: bool,
     overwrite: bool,
+    prepare_publish: bool = False,
 ) -> str:
     """Create a conda pack given an environment yaml file under conda pack folder specified.
 
@@ -123,6 +125,8 @@ def _create(
         whether to build against GPU image
     overwrite : bool
         whether to overwrite existing pack of the same slug
+    prepare_pubish : bool
+        whether to create conda pack archive after conda pack is created
 
     Raises
     ------
@@ -180,6 +184,11 @@ def _create(
     manifest["manifest"]["manifest_version"] = "1.0"
 
     logger.info(f"Creating conda environment {slug}")
+    conda_dep = None
+    with open(env_file) as mfile:
+        conda_dep = yaml.safe_load(mfile.read())
+    conda_dep["manifest"] = manifest["manifest"]
+
     if is_in_notebook_session() or NO_CONTAINER:
         command = f"conda env create --prefix {pack_folder_path} --file {os.path.abspath(os.path.expanduser(env_file))}"
         run_command(command, shell=True)
@@ -191,35 +200,56 @@ def _create(
         )
 
         create_command = f"conda env create --prefix {docker_pack_folder_path} --file {docker_env_file_path}"
-
+            
         volumes = {
             pack_folder_path: {"bind": docker_pack_folder_path},
             os.path.abspath(os.path.expanduser(env_file)): {
                 "bind": docker_env_file_path
             },
+
         }
+
         if gpu:
             image = ML_JOB_GPU_IMAGE
         else:
             image = ML_JOB_IMAGE
         try:
-            run_container(
-                image=image, bind_volumes=volumes, env_vars={}, command=create_command
-            )
+            if prepare_publish:
+                tmp_file = tempfile.NamedTemporaryFile(suffix=".yaml")
+                # Save the manifest in the temp file that can be mounted inside the container so that archiving will work
+                with open(tmp_file.name, 'w') as f:
+                    yaml.safe_dump(conda_dep, f)      
+
+                pack_script = os.path.join(os.path.dirname(os.path.abspath(__file__)), "pack.py")
+                pack_command = f"python {os.path.join(DEFAULT_IMAGE_HOME_DIR, 'pack.py')} --conda-path {docker_pack_folder_path} --manifest-location {os.path.join(DEFAULT_IMAGE_HOME_DIR, 'manifest.yaml')}"
+
+                # add pack script and manifest file to the mount so that archive can be created in the same container run
+                condapack_script = {
+                    pack_script: {"bind": os.path.join(DEFAULT_IMAGE_HOME_DIR, "pack.py")},
+                    tmp_file.name: {"bind": os.path.join(DEFAULT_IMAGE_HOME_DIR, "manifest.yaml")}
+                }
+                volumes = {**volumes, **condapack_script} # | not supported in python 3.8
+
+                run_container(
+                    image=image, bind_volumes=volumes, entrypoint="/bin/bash -c ", env_vars={}, command=f" '{create_command} && {pack_command}'"
+                )
+            else:
+                run_container(
+                    image=image, bind_volumes=volumes, env_vars={}, command=create_command
+                )                
         except Exception:
             if os.path.exists(pack_folder_path):
                 shutil.rmtree(pack_folder_path)
             raise RuntimeError(f"Could not create environment {slug}.")
 
-    conda_dep = None
-    with open(env_file) as mfile:
-        conda_dep = yaml.safe_load(mfile.read())
-    conda_dep["manifest"] = manifest["manifest"]
-    with open(f"{os.path.join(pack_folder_path, slug)}_manifest.yaml", "w") as mfile:
+    # Save the manifest file inside the host machine, where the conda environment is saved.
+    manifest_location = f"{os.path.join(pack_folder_path, slug)}_manifest.yaml"
+    with open(manifest_location, "w") as mfile:
         yaml.safe_dump(conda_dep, mfile)
 
     logger.info(f"Environment `{slug}` setup complete.")
     print(f"Pack {slug} created under {pack_folder_path}.")
+
     return slug
 
 
@@ -467,6 +497,7 @@ def _install(
 def publish(**kwargs) -> None:
     p = ConfigProcessor().step(ConfigMerger, **kwargs)
     exec_config = p.config["execution"]
+    skip_archive = False
     if exec_config.get("environment_file", None):
         name = _get_name(exec_config.get("name"), exec_config.get("environment_file"))
         slug = _create(
@@ -476,7 +507,9 @@ def publish(**kwargs) -> None:
             conda_pack_folder=exec_config["conda_pack_folder"],
             gpu=exec_config.get("gpu", False),
             overwrite=exec_config["overwrite"],
+            prepare_publish=True
         )
+        skip_archive = True # The conda pack archive is already created during create process.
     else:
         slug = exec_config.get("slug")
     if not slug:
@@ -493,9 +526,10 @@ def publish(**kwargs) -> None:
         oci_profile=exec_config.get("oci_profile"),
         overwrite=exec_config["overwrite"],
         auth_type=exec_config["auth"],
+        skip_archive=skip_archive
     )
 
-
+    
 def _publish(
     conda_slug: str,
     conda_uri_prefix: str,
@@ -504,6 +538,7 @@ def _publish(
     oci_profile: str,
     overwrite: bool,
     auth_type: str,
+    skip_archive: bool = False
 ) -> None:
     """Publish a local conda pack to object storage location
 
@@ -579,29 +614,30 @@ def _publish(
                 publish_slug = "_".join(ans.lower().split(" "))
 
     pack_script = os.path.join(os.path.dirname(os.path.abspath(__file__)), "pack.py")
-    if is_in_notebook_session() or NO_CONTAINER:
-        command = f"python {pack_script} {pack_folder_path}"
-        run_command(command, shell=True)
-    else:
-        volumes = {
-            pack_folder_path: {
-                "bind": os.path.join(DEFAULT_IMAGE_HOME_DIR, conda_slug)
-            },
-            pack_script: {"bind": os.path.join(DEFAULT_IMAGE_HOME_DIR, "pack.py")},
-        }
-        command = f"python {os.path.join(DEFAULT_IMAGE_HOME_DIR, 'pack.py')} {os.path.join(DEFAULT_IMAGE_HOME_DIR, conda_slug)}"
-        gpu = env["manifest"]["arch_type"] == "GPU"
-        _check_job_image_exists(gpu)
-        if gpu:
-            image = ML_JOB_GPU_IMAGE
+    if not skip_archive:
+        if is_in_notebook_session() or NO_CONTAINER:
+            command = f"python {pack_script} --conda-path {pack_folder_path}"
+            run_command(command, shell=True)
         else:
-            image = ML_JOB_IMAGE
-        try:
-            run_container(
-                image=image, bind_volumes=volumes, env_vars={}, command=command
-            )
-        except Exception:
-            raise RuntimeError(f"Could not pack environment {conda_slug}.")
+            volumes = {
+                pack_folder_path: {
+                    "bind": os.path.join(DEFAULT_IMAGE_HOME_DIR, conda_slug)
+                },
+                pack_script: {"bind": os.path.join(DEFAULT_IMAGE_HOME_DIR, "pack.py")},
+            }
+            command = f"python {os.path.join(DEFAULT_IMAGE_HOME_DIR, 'pack.py')} --conda-path {os.path.join(DEFAULT_IMAGE_HOME_DIR, conda_slug)}"
+            gpu = env["manifest"]["arch_type"] == "GPU"
+            _check_job_image_exists(gpu)
+            if gpu:
+                image = ML_JOB_GPU_IMAGE
+            else:
+                image = ML_JOB_IMAGE
+            try:
+                run_container(
+                    image=image, bind_volumes=volumes, env_vars={}, command=command
+                )
+            except Exception:
+                raise RuntimeError(f"Could not pack environment {conda_slug}.")
 
     pack_file = os.path.join(pack_folder_path, f"{conda_slug}.tar.gz")
     if not os.path.exists(pack_file):

ads/opctl/conda/pack.py

@@ -16,11 +16,14 @@
 import conda_pack
 
 import yaml
+import argparse
 
 
-def main(pack_folder_path):
+def main(pack_folder_path, manifest_file=None):
     slug = os.path.basename(pack_folder_path)
-    manifest_path = glob.glob(os.path.join(pack_folder_path, "*_manifest.yaml"))[0]
+    manifest_path = (
+        manifest_file or glob.glob(os.path.join(pack_folder_path, "*_manifest.yaml"))[0]
+    )
     with open(manifest_path) as f:
         env = yaml.safe_load(f.read())
 
@@ -59,8 +62,10 @@ def main(pack_folder_path):
             raise RuntimeError(
                 "Error creating the pack file using `conda_pack.pack()`."
             )
+        print(f"Copy {pack_file} to {pack_folder_path}")
         shutil.copy(pack_file, pack_folder_path)
         file_path = os.path.join(pack_folder_path, os.path.basename(pack_file))
+        print(f"Pack built at {file_path}")
         print(
             f"changing permission for {file_path}",
             flush=True,
@@ -69,4 +74,14 @@ def main(pack_folder_path):
 
 
 if __name__ == "__main__":
-    main(sys.argv[1])
+    parser = argparse.ArgumentParser(
+        prog="Prepare conda archive",
+        description="Uses conda_pack library to pack the conda environment.",
+    )
+    parser.add_argument("--conda-path", type=str, help="Path to the conda environment")
+    parser.add_argument(
+        "--manifest-location", type=str, default=None, help="Path to manifest location"
+    )
+    args = parser.parse_args()
+
+    main(args.conda_path, args.manifest_location)