Merge branch 'main' into 2.7.x

Author: z7ye

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,84 @@
+name: Bug Report
+description: Bug observed in oracle-ads library
+title: "[Bug]: "
+labels: [Bug, Backlog]
+assignees:
+  - octocat
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If you think you've found a security vulnerability, don't raise a GitHub issue and follow the instructions 
+        in our [security policy](https://github.com/oracle/accelerated-data-science/security/policy).
+        
+        ---
+        
+        Thank you for taking the time to file a bug report.
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Oracle-ads version used
+      options:
+        - label: >
+            I have checked that this issue has not already been reported.
+          required: true
+        - label: >
+            I have confirmed this bug exists on the
+            [latest version](https://https://github.com/oracle/accelerated-data-science/releases/) of oracle-ads.
+        - label: >
+            I have confirmed this bug exists on the main branch of oracle-ads.
+        - label: >
+            I agree to follow [Code of Conduct](https://github.com/oracle/.github/blob/main/CODE_OF_CONDUCT.md).
+          required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: >
+        Please provide a brief description of the problem, describe setup used as that may be the key to the issue.
+    validations:
+      required: true
+  - type: textarea
+    id: how-to-reproduce
+    attributes:
+      label: How to Reproduce
+      description: >
+        Please provide a copy-pastable short code example. 
+        If possible provide an ordered list of steps on how to reproduce the problem.
+      placeholder: >
+        import ads
+
+        ...
+      render: python
+    validations:
+      required: true
+  - type: textarea
+    id: what-was-observed
+    attributes:
+      label: What was Observed
+      description: >
+        Please provide snippets of output or describe wrong behavior.
+    validations:
+      required: true
+  - type: textarea
+    id: what-was-expected
+    attributes:
+      label: What was Expected
+      description: >
+        Please describe what should have happened and how it is different from what was observed.
+    validations:
+      required: true
+  - type: textarea
+    id: version
+    attributes:
+      label: Version
+      description: >
+        Please paste the output of ``ads.__version__``
+      value: >
+        <details>
+
+        Paste here the output of ads.__version__
+
+        </details>
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Check the docs
+    url: https://accelerated-data-science.readthedocs.io/en/latest/
+    about: If you need help with your first steps with oracle-ads please check the docs.

.github/workflows/codeql.yml

@@ -0,0 +1,74 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+  schedule:
+    - cron: '40 11 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

ads/jobs/ads_job.py

@@ -49,7 +49,7 @@ class Job(Builder):
             .with_runtime(
                 ScriptRuntime()
                 .with_source("oci://bucket_name@namespace/path/to/script.py")
-                .with_service_conda("tensorflow26_p37_cpu_v2")
+                .with_service_conda("tensorflow28_p38_cpu_v1")
                 .with_environment_variable(ENV="value")
                 .with_argument("argument", key="value")
                 .with_freeform_tag(tag_name="tag_value")
@@ -79,7 +79,7 @@ class Job(Builder):
             .with_runtime(
                 NotebookRuntime()
                 .with_notebook("path/to/notebook.ipynb")
-                .with_service_conda(tensorflow26_p37_cpu_v2")
+                .with_service_conda("tensorflow28_p38_cpu_v1")
                 # Saves the notebook with outputs to OCI object storage.
                 .with_output("oci://bucket_name@namespace/path/to/dir")
             )

docs/source/user_guide/jobs/data_science_job.rst

@@ -99,7 +99,7 @@ All of these runtime options allow you to configure a `Data Science Conda Enviro
     runtime = (
         ScriptRuntime()
         .with_source("oci://bucket_name@namespace/path/to/script.py")
-        .with_service_conda("tensorflow26_p37_cpu_v2")
+        .with_service_conda("tensorflow28_p38_cpu_v1")
     )
 
 You can store your source code in a local file path or location supported by `fsspec <https://filesystem-spec.readthedocs.io/en/latest/>`__, including OCI Object Storage.
@@ -123,7 +123,7 @@ You can also configure the environment variables, command line arguments, and fr
     runtime = (
         ScriptRuntime()
         .with_source("oci://bucket_name@namespace/path/to/script.py")
-        .with_service_conda("tensorflow26_p37_cpu_v2")
+        .with_service_conda("tensorflow28_p38_cpu_v1")
         .with_environment_variable(ENV="value")
         .with_argument("argument", key="value")
         .with_freeform_tag(tag_name="tag_value")
@@ -249,7 +249,7 @@ Here is an example of a YAML file representing the job defined in the preceding
         type: script
         spec:
           conda:
-            slug: tensorflow26_p37_cpu_v2
+            slug: tensorflow28_p38_cpu_v1
             type: service
           scriptPathURI: oci://bucket_name@namespace/path/to/script.py
 

docs/source/user_guide/jobs/run_notebook.rst

@@ -34,7 +34,7 @@ Python
                 path="https://raw.githubusercontent.com/tensorflow/docs/master/site/en/tutorials/customization/basics.ipynb",
                 encoding='utf-8'
             )
-            .with_service_conda(tensorflow26_p37_cpu_v2")
+            .with_service_conda("tensorflow28_p38_cpu_v1")
             .with_environment_variable(GREETINGS="Welcome to OCI Data Science")
             .with_output("oci://bucket_name@namespace/path/to/dir")
         )
@@ -84,7 +84,7 @@ You could use the following YAML to create the job:
 	    spec:
           notebookPathURI: /path/to/notebook
 	      conda:
-            slug: tensorflow26_p37_cpu_v1
+            slug: tensorflow28_p38_cpu_v1
             type: service
 
 **NotebookRuntime Schema**

docs/source/user_guide/model_catalog/model_catalog.rst

@@ -21,7 +21,7 @@ provenance, reproduced, and deployed.
     from ads.catalog.model import ModelCatalog
     from ads.common.model import ADSModel
     from ads.common.model_export_util import prepare_generic_model
-    from ads.model.model_metadata import (MetadataCustomCategory,
+    from ads.common.model_metadata import (MetadataCustomCategory,
                                            UseCaseType,
                                            Framework)
     from ads.dataset.factory import DatasetFactory

docs/source/user_guide/model_registration/frameworks/automlmodel.rst

@@ -64,7 +64,7 @@ Example
 
   from ads.automl.driver import AutoML
   from ads.automl.provider import OracleAutoMLProvider
-  from ads.model.model_metadata import UseCaseType
+  from ads.common.model_metadata import UseCaseType
   from ads.dataset.dataset_browser import DatasetBrowser
   from ads.model.framework.automl_model import AutoMLModel
 

docs/source/user_guide/model_registration/frameworks/lightgbmmodel.rst

@@ -38,14 +38,14 @@ The Training API in ``LightGBM`` contains training and cross-validation routines
             trainx,
             trainy,
         )
-
+    
 
 Prepare Model Artifact
 ======================
 
 .. code-block:: python3
 
-    from ads.model.model_metadata import UseCaseType
+    from ads.common.model_metadata import UseCaseType
     from ads.model.framework.lightgbm_model import LightGBMModel
 
     artifact_dir = tempfile.mkdtemp()
@@ -117,7 +117,7 @@ Run Prediction against Endpoint
     # Generate prediction by invoking the deployed endpoint
     lightgbm_model.predict(testx)['prediction']
 
-.. parsed-literal::
+.. parsed-literal:: 
 
     [1,0,...,1]
 
@@ -250,7 +250,7 @@ Example
 .. code-block:: python3
 
     from ads.model.framework.lightgbm_model import LightGBMModel
-    from ads.model.model_metadata import UseCaseType
+    from ads.common.model_metadata import UseCaseType
 
     import lightgbm as lgb
 

docs/source/user_guide/model_registration/frameworks/pytorchmodel.rst

@@ -37,7 +37,7 @@ Serializing model in TorchScript program by setting `use_torch_script` to `True`
 
 .. code-block:: python3
 
-    from ads.model.model_metadata import UseCaseType
+    from ads.common.model_metadata import UseCaseType
     from ads.model.framework.pytorch_model import PyTorchModel
 
     import tempfile
@@ -59,7 +59,7 @@ Save state_dict
 ---------------
 .. code-block:: python3
 
-    from ads.model.model_metadata import UseCaseType
+    from ads.common.model_metadata import UseCaseType
     from ads.model.framework.pytorch_model import PyTorchModel
 
     import tempfile
@@ -417,7 +417,7 @@ Example
 
 .. code-block:: python3
 
-    from ads.model.model_metadata import UseCaseType
+    from ads.common.model_metadata import UseCaseType
     from ads.model.framework.pytorch_model import PyTorchModel
 
     import numpy as np