Skip to content

Commit 017e271

Browse files
qiuosierqiuosier
committed
Merge commit '20b2baaaf303c027c2767cd2a572e90142c914de' from 2.8.x
2 parents 86fab0d + 20b2baa commit 017e271

File tree

94 files changed

+3475
-1995
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+3475
-1995
lines changed

‎ads/ads_version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "2.8.0"
2+
"version": "2.8.1"
33
}

‎ads/catalog/model.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8; -*-
33

4-
# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
4+
# Copyright (c) 2020, 2023 Oracle and/or its affiliates.
55
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
66

77
import warnings
@@ -1559,15 +1559,21 @@ def _wait_for_work_request(
15591559
work_request_logs = self.ds_client.list_work_request_logs(
15601560
work_request_id
15611561
).data
1562-
new_work_request_logs = work_request_logs[i:]
1562+
if work_request_logs:
1563+
new_work_request_logs = work_request_logs[i:]
15631564

15641565
for wr_item in new_work_request_logs:
15651566
progress.update(wr_item.message)
15661567
i += 1
15671568

15681569
if work_request.data.status in STOP_STATE:
15691570
if work_request.data.status != WorkRequest.STATUS_SUCCEEDED:
1570-
raise Exception(work_request_logs[-1].message)
1571+
if work_request_logs:
1572+
raise Exception(work_request_logs[-1].message)
1573+
else:
1574+
raise Exception(
1575+
"An error occurred in attempt to perform the operation. Check the service logs to get more details."
1576+
)
15711577
else:
15721578
break
15731579
return work_request

‎ads/common/auth.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def create_signer(
283283
>>> auth = ads.auth.create_signer(config=config) # api_key type of authentication dictionary created based on provided config
284284
285285
>>> singer = oci.auth.signers.get_resource_principals_signer()
286-
>>> auth = ads.auth.create_signer(config={}, singer=signer) # resource principals authentication dictionary created
286+
>>> auth = ads.auth.create_signer(config={}, signer=signer) # resource principals authentication dictionary created
287287
288288
>>> auth = ads.auth.create_signer(auth_type='instance_principal') # instance principals authentication dictionary created
289289

‎ads/model/datascience_model.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8; -*-
33

4-
# Copyright (c) 2022 Oracle and/or its affiliates.
4+
# Copyright (c) 2022, 2023 Oracle and/or its affiliates.
55
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
66

77
import cgi
@@ -590,10 +590,11 @@ def create(self, **kwargs) -> "DataScienceModel":
590590
self.dsc_model = self._to_oci_dsc_model(**kwargs).create()
591591

592592
# Create model provenance
593-
logger.info("Saving model provenance metadata.")
594-
self.dsc_model.create_model_provenance(
595-
self.provenance_metadata._to_oci_metadata()
596-
)
593+
if self.provenance_metadata:
594+
logger.info("Saving model provenance metadata.")
595+
self.dsc_model.create_model_provenance(
596+
self.provenance_metadata._to_oci_metadata()
597+
)
597598

598599
# Upload artifacts
599600
logger.info("Uploading model artifacts.")

‎ads/model/service/oci_datascience_model.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8; -*-
33

4-
# Copyright (c) 2022 Oracle and/or its affiliates.
4+
# Copyright (c) 2022, 2023 Oracle and/or its affiliates.
55
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
66

77
import logging
@@ -573,14 +573,20 @@ def _wait_for_work_request(self, work_request_id: str, num_steps: int = 3) -> No
573573
work_request_logs = self.client.list_work_request_logs(
574574
work_request_id
575575
).data
576-
new_work_request_logs = work_request_logs[i:]
576+
if work_request_logs:
577+
new_work_request_logs = work_request_logs[i:]
577578

578579
for wr_item in new_work_request_logs:
579580
progress.update(wr_item.message)
580581
i += 1
581582

582583
if work_request.data.status in STOP_STATE:
583584
if work_request.data.status != WorkRequest.STATUS_SUCCEEDED:
584-
raise Exception(work_request_logs[-1].message)
585+
if work_request_logs:
586+
raise Exception(work_request_logs[-1].message)
587+
else:
588+
raise Exception(
589+
"An error occurred in attempt to perform the operation. Check the service logs to get more details."
590+
)
585591
else:
586592
break

‎ads/opctl/cli.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import yaml
1313

1414
from ads.common.auth import AuthType
15+
from ads.common import auth as authutil
1516
from ads.opctl.cmds import cancel as cancel_cmd
1617
from ads.opctl.cmds import configure as configure_cmd
1718
from ads.opctl.cmds import delete as delete_cmd
@@ -358,7 +359,12 @@ def run(file, **kwargs):
358359
debug = kwargs["debug"]
359360
if file:
360361
if os.path.exists(file):
361-
auth = kwargs["auth"] or authutil.default_signer()
362+
auth = {}
363+
if kwargs["auth"]:
364+
auth = authutil.create_signer(kwargs["auth"])
365+
else:
366+
auth = authutil.default_signer()
367+
362368
with fsspec.open(file, "r", **auth) as f:
363369
config = suppress_traceback(debug)(yaml.safe_load)(f.read())
364370
else:

‎docs/source/ads.automl.rst‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,22 @@ ads.automl.driver module
88
------------------------
99

1010
.. automodule:: ads.automl.driver
11-
:members:
12-
:undoc-members:
13-
:show-inheritance:
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
1414

1515
ads.automl.provider module
1616
--------------------------
1717

1818
.. automodule:: ads.automl.provider
19-
:members:
20-
:undoc-members:
21-
:show-inheritance:
22-
19+
:members:
20+
:undoc-members:
21+
:show-inheritance:
2322

2423
Module contents
2524
---------------
2625

2726
.. automodule:: ads.automl
28-
:members:
29-
:undoc-members:
30-
:show-inheritance:
27+
:members:
28+
:undoc-members:
29+
:show-inheritance:

‎docs/source/ads.bds.rst‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,22 @@ ads.bds.auth module
88
-------------------
99

1010
.. automodule:: ads.bds.auth
11-
:members:
12-
:undoc-members:
13-
:show-inheritance:
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
14+
15+
ads.bds.big\_data\_service module
16+
---------------------------------
17+
18+
.. automodule:: ads.bds.big_data_service
19+
:members:
20+
:undoc-members:
21+
:show-inheritance:
1422

1523
Module contents
1624
---------------
1725

1826
.. automodule:: ads.bds
19-
:members:
20-
:undoc-members:
21-
:show-inheritance:
27+
:members:
28+
:undoc-members:
29+
:show-inheritance:

‎docs/source/ads.catalog.rst‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,38 @@ ads.catalog.model module
88
------------------------
99

1010
.. automodule:: ads.catalog.model
11-
:members:
12-
:undoc-members:
13-
:show-inheritance:
11+
:members:
12+
:undoc-members:
13+
:show-inheritance:
1414

1515
ads.catalog.notebook module
1616
---------------------------
1717

1818
.. automodule:: ads.catalog.notebook
19-
:members:
20-
:undoc-members:
21-
:show-inheritance:
19+
:members:
20+
:undoc-members:
21+
:show-inheritance:
2222

2323
ads.catalog.project module
2424
--------------------------
2525

2626
.. automodule:: ads.catalog.project
27-
:members:
28-
:undoc-members:
29-
:show-inheritance:
27+
:members:
28+
:undoc-members:
29+
:show-inheritance:
3030

3131
ads.catalog.summary module
3232
--------------------------
3333

3434
.. automodule:: ads.catalog.summary
35-
:members:
36-
:undoc-members:
37-
:show-inheritance:
38-
35+
:members:
36+
:undoc-members:
37+
:show-inheritance:
3938

4039
Module contents
4140
---------------
4241

4342
.. automodule:: ads.catalog
44-
:members:
45-
:undoc-members:
46-
:show-inheritance:
43+
:members:
44+
:undoc-members:
45+
:show-inheritance:

‎docs/source/ads.common.artifact.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ads.common.artifact package
2+
===========================
3+
4+
Module contents
5+
---------------
6+
7+
.. automodule:: ads.common.artifact
8+
:members:
9+
:undoc-members:
10+
:show-inheritance:

0 commit comments

Comments
 (0)