Skip to content

Commit

Permalink
Merge branch 'dev' into mor--mbsdk-video-dataset-model-export-samples
Browse files Browse the repository at this point in the history
  • Loading branch information
sasha-gitg committed Apr 20, 2021
2 parents 077e15d + c2caaa6 commit 640d930
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 17 deletions.
26 changes: 26 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,31 @@
# Changelog

### [0.7.1](https://www.github.com/googleapis/python-aiplatform/compare/v0.7.0...v0.7.1) (2021-04-14)


### Bug Fixes

* fix list failing without order_by and local sorting ([#320](https://www.github.com/googleapis/python-aiplatform/issues/320)) ([06e99db](https://www.github.com/googleapis/python-aiplatform/commit/06e99db849d954344aeb8bdefde41d1884e36315))

## [0.7.0](https://www.github.com/googleapis/python-aiplatform/compare/v0.6.0...v0.7.0) (2021-04-14)


### Features

* Add Custom Container Prediction support, move to single API endpoint ([#277](https://www.github.com/googleapis/python-aiplatform/issues/277)) ([ca7f6d6](https://www.github.com/googleapis/python-aiplatform/commit/ca7f6d64ea75349a841b53fe6ef6547942439e35))
* Add initial Model Builder SDK samples ([#265](https://www.github.com/googleapis/python-aiplatform/issues/265)) ([1230dc6](https://www.github.com/googleapis/python-aiplatform/commit/1230dc68a34c5b747186d31a25d1b8f40bf7a97e))
* Add list() method to all resource nouns ([#294](https://www.github.com/googleapis/python-aiplatform/issues/294)) ([3ec9386](https://www.github.com/googleapis/python-aiplatform/commit/3ec9386f8f766662c91922af66b8098ddfa1eb8f))
* add support for multiple client versions, change aiplatform from compat.V1BETA1 to compat.V1 ([#290](https://www.github.com/googleapis/python-aiplatform/issues/290)) ([89e3212](https://www.github.com/googleapis/python-aiplatform/commit/89e321246b6223a2355947d8dbd0161b84523478))
* Make aiplatform.Dataset private ([#296](https://www.github.com/googleapis/python-aiplatform/issues/296)) ([1f0d5f3](https://www.github.com/googleapis/python-aiplatform/commit/1f0d5f3e3f95ee5056545e9d4742b96e9380a22e))
* parse project location when passed full resource name to get apis ([#297](https://www.github.com/googleapis/python-aiplatform/issues/297)) ([674227d](https://www.github.com/googleapis/python-aiplatform/commit/674227d2e7ed4a4a4e180213dc1178dde7d65a3a))


### Bug Fixes

* add quotes to logged snippet ([0ecd0a8](https://www.github.com/googleapis/python-aiplatform/commit/0ecd0a8bbc5a2fc645877d0eb3b930e1b03a270a))
* make logging more informative during training ([#310](https://www.github.com/googleapis/python-aiplatform/issues/310)) ([9a4d991](https://www.github.com/googleapis/python-aiplatform/commit/9a4d99150a035b8dde7b4f9e72f25745af17b609))
* remove TPU from accelerator test cases ([57f4fcf](https://www.github.com/googleapis/python-aiplatform/commit/57f4fcf7637467f6176436f6d2e1f6c8be909c4a))

## [0.6.0](https://www.github.com/googleapis/python-aiplatform/compare/v0.5.1...v0.6.0) (2021-03-22)


Expand Down
8 changes: 0 additions & 8 deletions README.rst
@@ -1,14 +1,6 @@
Python Client for Cloud AI Platform
=================================================

**Experimental**

This is an Experimental release. Experiments are focused on validating a prototype. They are not guaranteed to be released and might be subject to backward-incompatible changes. They are not intended for production use or covered by any SLA, support obligation, or deprecation policy. They are covered by the `Pre-GA Offerings Terms`_ of the Google Cloud Platform Terms of Services.

.. _Pre-GA Offerings Terms: https://cloud.google.com/terms/service-terms#1

----

|beta| |pypi| |versions|


Expand Down
15 changes: 8 additions & 7 deletions google/cloud/aiplatform/base.py
Expand Up @@ -923,14 +923,15 @@ def _list_with_local_order(
credentials=credentials,
)

desc = "desc" in order_by
order_by = order_by.replace("desc", "")
order_by = order_by.split(",")
if order_by:
desc = "desc" in order_by
order_by = order_by.replace("desc", "")
order_by = order_by.split(",")

li.sort(
key=lambda x: tuple(getattr(x, field.strip()) for field in order_by),
reverse=desc,
)
li.sort(
key=lambda x: tuple(getattr(x, field.strip()) for field in order_by),
reverse=desc,
)

return li

Expand Down
2 changes: 1 addition & 1 deletion samples/snippets/requirements.txt
@@ -1,3 +1,3 @@
pytest==6.2.2
google-cloud-storage>=1.26.0, <2.0.0dev
google-cloud-aiplatform==0.6.0
google-cloud-aiplatform==0.7.1
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -21,7 +21,7 @@
import setuptools # type: ignore

name = "google-cloud-aiplatform"
version = "0.6.0"
version = "0.7.1"
description = "Cloud AI Platform API client library"

package_root = os.path.abspath(os.path.dirname(__file__))
Expand Down
14 changes: 14 additions & 0 deletions tests/unit/aiplatform/test_datasets.py
Expand Up @@ -849,6 +849,20 @@ def test_list_dataset(self, list_datasets_mock):
for ds in ds_list:
assert type(ds) == aiplatform.TabularDataset

def test_list_dataset_no_order_or_filter(self, list_datasets_mock):

ds_list = aiplatform.TabularDataset.list()

list_datasets_mock.assert_called_once_with(
request={"parent": _TEST_PARENT, "filter": None}
)

# Ensure returned list is smaller since it filtered out non-tabular datasets
assert len(ds_list) < len(_TEST_DATASET_LIST)

for ds in ds_list:
assert type(ds) == aiplatform.TabularDataset


class TestTextDataset:
def setup_method(self):
Expand Down

0 comments on commit 640d930

Please sign in to comment.