Merge branch '2.8.2' of github.com:oracle/accelerated-data-science into ODSC-38627/huggingface_docs

Author: z7ye

.github/workflows/run-unittests.yml

@@ -0,0 +1,69 @@
+name: Unit Tests
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - 'release/**'
+      - develop
+    paths:
+      - '!docs/**'
+
+  pull_request:
+
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: ${{ matrix.tests-type }}, python ${{ matrix.python-version }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.7","3.8","3.9","3.10"]
+        tests-type: ["DefaultSetup"]
+
+    steps:
+      - uses: actions/checkout@v3
+#      - uses: actions/cache@v3
+#        with:
+#          path: ~/.cache/pip
+#          key: ${{ runner.os }}-pip-${{ hashFiles('**/test-requirements.txt') }}
+#          restore-keys: |
+#            ${{ runner.os }}-pip-
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: "Setup test env"
+        run: |
+          pip install coverage pytest-codecov tox==4.2.8
+
+      - name: "Run unit tests"
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+#          coverage erase
+#          ./scripts/runtox.sh "${{ matrix.python-version }}-${{ matrix.tests-type }}" --cov --cov-report=
+#          coverage combine .coverage-*
+#          coverage html -i
+
+      # Uploading test artifacts
+      # https://docs.github.com/en/actions/using-workflows/storing-workflow-data-as-artifacts#uploading-build-and-test-artifacts
+#      - name: "Upload artifact"
+#        uses: actions/upload-artifact@v3
+#        with:
+#          name: code-coverage-report
+#          path: htmlcov/
+#          retention-days: 10

README.md

@@ -166,7 +166,7 @@ This example uses SQL injection safe binding variables.
 
 ## Contributing
 
-This project welcomes contributions from the community. Before submitting a pull request, please review our contribution guide [CONTRIBUTING.md](https://github.com/oracle/accelerated-data-science/blob/main/CONTRIBUTING.md).
+This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md)
 
 Find Getting Started instructions for developers in [README-development.md](https://github.com/oracle/accelerated-data-science/blob/main/README-development.md)
 

SECURITY.md

@@ -6,11 +6,10 @@ and privacy of all our users.
 
 Please do NOT raise a GitHub Issue to report a security vulnerability. If you
 believe you have found a security vulnerability, please submit a report to
-[secalert_us@oracle.com](mailto:secalert_us@oracle.com) preferably with a proof of concept. 
-Please review some additional information on 
-[how to report security vulnerabilities to Oracle](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html).
+[secalert_us@oracle.com][1] preferably with a proof of concept. Please review
+some additional information on [how to report security vulnerabilities to Oracle][2].
 We encourage people who contact Oracle Security to use email encryption using
-[our encryption key](https://www.oracle.com/security-alerts/encryptionkey.html).
+[our encryption key][3].
 
 We ask that you do not use other channels or contact the project maintainers
 directly.
@@ -22,15 +21,18 @@ security features are welcome on GitHub Issues.
 
 Security updates will be released on a regular cadence. Many of our projects
 will typically release security fixes in conjunction with the
-[Oracle Critical Patch Update](https://www.oracle.com/security-alerts/encryptionkey.html) program. 
-Security updates are released on the Tuesday closest to the 17th day of January, April, July and October. 
-A pre-release announcement will be published on the Thursday preceding each release. Additional
-information, including past advisories, is available on our 
-[security alerts](https://www.oracle.com/security-alerts/) page.
+[Oracle Critical Patch Update][3] program. Additional
+information, including past advisories, is available on our [security alerts][4]
+page.
 
 ## Security-related information
 
 We will provide security related information such as a threat model, considerations
 for secure use, or any known security issues in our documentation. Please note
 that labs and sample code are intended to demonstrate a concept and may not be
 sufficiently hardened for production use.
+
+[1]: mailto:secalert_us@oracle.com
+[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
+[3]: https://www.oracle.com/security-alerts/encryptionkey.html
+[4]: https://www.oracle.com/security-alerts/

ads/ads_version.json

@@ -1,3 +1,3 @@
 {
-  "version": "2.8.0"
+  "version": "2.8.1"
 }

ads/catalog/model.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8; -*-
 
-# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2023 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import warnings
@@ -1559,15 +1559,21 @@ def _wait_for_work_request(
                 work_request_logs = self.ds_client.list_work_request_logs(
                     work_request_id
                 ).data
-                new_work_request_logs = work_request_logs[i:]
+                if work_request_logs:
+                    new_work_request_logs = work_request_logs[i:]
 
                 for wr_item in new_work_request_logs:
                     progress.update(wr_item.message)
                     i += 1
 
                 if work_request.data.status in STOP_STATE:
                     if work_request.data.status != WorkRequest.STATUS_SUCCEEDED:
-                        raise Exception(work_request_logs[-1].message)
+                        if work_request_logs:
+                            raise Exception(work_request_logs[-1].message)
+                        else:
+                            raise Exception(
+                                "An error occurred in attempt to perform the operation. Check the service logs to get more details."
+                            )
                     else:
                         break
         return work_request

ads/common/auth.py

@@ -283,7 +283,7 @@ def create_signer(
     >>> auth = ads.auth.create_signer(config=config) # api_key type of authentication dictionary created based on provided config
 
     >>> singer = oci.auth.signers.get_resource_principals_signer()
-    >>> auth = ads.auth.create_signer(config={}, singer=signer) # resource principals authentication dictionary created
+    >>> auth = ads.auth.create_signer(config={}, signer=signer) # resource principals authentication dictionary created
 
     >>> auth = ads.auth.create_signer(auth_type='instance_principal') # instance principals authentication dictionary created
 

ads/model/datascience_model.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8; -*-
 
-# Copyright (c) 2022 Oracle and/or its affiliates.
+# Copyright (c) 2022, 2023 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import cgi
@@ -590,10 +590,11 @@ def create(self, **kwargs) -> "DataScienceModel":
         self.dsc_model = self._to_oci_dsc_model(**kwargs).create()
 
         # Create model provenance
-        logger.info("Saving model provenance metadata.")
-        self.dsc_model.create_model_provenance(
-            self.provenance_metadata._to_oci_metadata()
-        )
+        if self.provenance_metadata:
+            logger.info("Saving model provenance metadata.")
+            self.dsc_model.create_model_provenance(
+                self.provenance_metadata._to_oci_metadata()
+            )
 
         # Upload artifacts
         logger.info("Uploading model artifacts.")

ads/model/service/oci_datascience_model.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8; -*-
 
-# Copyright (c) 2022 Oracle and/or its affiliates.
+# Copyright (c) 2022, 2023 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import logging
@@ -573,14 +573,20 @@ def _wait_for_work_request(self, work_request_id: str, num_steps: int = 3) -> No
                 work_request_logs = self.client.list_work_request_logs(
                     work_request_id
                 ).data
-                new_work_request_logs = work_request_logs[i:]
+                if work_request_logs:
+                    new_work_request_logs = work_request_logs[i:]
 
                 for wr_item in new_work_request_logs:
                     progress.update(wr_item.message)
                     i += 1
 
                 if work_request.data.status in STOP_STATE:
                     if work_request.data.status != WorkRequest.STATUS_SUCCEEDED:
-                        raise Exception(work_request_logs[-1].message)
+                        if work_request_logs:
+                            raise Exception(work_request_logs[-1].message)
+                        else:
+                            raise Exception(
+                                "An error occurred in attempt to perform the operation. Check the service logs to get more details."
+                            )
                     else:
                         break

ads/opctl/cli.py

@@ -12,6 +12,7 @@
 import yaml
 
 from ads.common.auth import AuthType
+from ads.common import auth as authutil
 from ads.opctl.cmds import cancel as cancel_cmd
 from ads.opctl.cmds import configure as configure_cmd
 from ads.opctl.cmds import delete as delete_cmd
@@ -358,7 +359,12 @@ def run(file, **kwargs):
     debug = kwargs["debug"]
     if file:
         if os.path.exists(file):
-            auth = kwargs["auth"] or authutil.default_signer()
+            auth = {}
+            if kwargs["auth"]:
+                auth = authutil.create_signer(kwargs["auth"])
+            else:
+                auth = authutil.default_signer()
+
             with fsspec.open(file, "r", **auth) as f:
                 config = suppress_traceback(debug)(yaml.safe_load)(f.read())
         else:

build_spec.yaml

@@ -0,0 +1,16 @@
+# Copyright (c) 2023, 2022, Oracle and/or its affiliates.
+
+version: 0.1
+component: build
+timeoutInSeconds: 1000
+shell: bash
+
+steps:
+  - type: Command
+    name: "compress the repo"
+    command: |
+      tar -cvzf ${OCI_WORKSPACE_DIR}/repo.tgz ./
+outputArtifacts:
+  - name: artifact
+    type: BINARY
+    location: ${OCI_WORKSPACE_DIR}/repo.tgz