From 58f7ab8b49562a3ea21dbd5529240ce1fbaef5dc Mon Sep 17 00:00:00 2001 From: chongyouquan <48691403+chongyouquan@users.noreply.github.com> Date: Fri, 24 Jun 2022 08:43:51 -0700 Subject: [PATCH] chore(sdk): Registry Client - default to read full spec of versions (#7936) * default to read full spec of versions * update tests * fix formatting --- sdk/python/kfp/registry/context/kfp_pkg_dev.json | 4 ++-- sdk/python/kfp/registry/registry_client.py | 8 +++++--- sdk/python/kfp/registry/registry_client_test.py | 10 +++++----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/sdk/python/kfp/registry/context/kfp_pkg_dev.json b/sdk/python/kfp/registry/context/kfp_pkg_dev.json index 95e178153f..3ec5ca7aaf 100644 --- a/sdk/python/kfp/registry/context/kfp_pkg_dev.json +++ b/sdk/python/kfp/registry/context/kfp_pkg_dev.json @@ -11,8 +11,8 @@ "delete_tag_url":"https://artifactregistry.googleapis.com/v1/projects/{project_id}/locations/{location}/repositories/{repo_id}/packages/{package_name}/tags/{tag}", "create_tag_url":"https://artifactregistry.googleapis.com/v1/projects/{project_id}/locations/{location}/repositories/{repo_id}/packages/{package_name}/tags?tagId={tag}", "update_tag_url":"https://artifactregistry.googleapis.com/v1/projects/{project_id}/locations/{location}/repositories/{repo_id}/packages/{package_name}/tags/{tag}?updateMask=version", - "get_version_url":"https://artifactregistry.googleapis.com/v1/projects/{project_id}/locations/{location}/repositories/{repo_id}/packages/{package_name}/versions/{version}", - "list_versions_url":"https://artifactregistry.googleapis.com/v1/projects/{project_id}/locations/{location}/repositories/{repo_id}/packages/{package_name}/versions", + "get_version_url":"https://artifactregistry.googleapis.com/v1/projects/{project_id}/locations/{location}/repositories/{repo_id}/packages/{package_name}/versions/{version}?view=FULL", + "list_versions_url":"https://artifactregistry.googleapis.com/v1/projects/{project_id}/locations/{location}/repositories/{repo_id}/packages/{package_name}/versions?view=FULL", "delete_version_url":"https://artifactregistry.googleapis.com/v1/projects/{project_id}/locations/{location}/repositories/{repo_id}/packages/{package_name}/versions/{version}", "package_format":"projects/{project_id}/locations/{location}/repositories/{repo_id}/packages/{package_name}", "tag_format":"projects/{project_id}/locations/{location}/repositories/{repo_id}/packages/{package_name}/tags/{tag}", diff --git a/sdk/python/kfp/registry/registry_client.py b/sdk/python/kfp/registry/registry_client.py index 387b0c20d4..e4071ccc97 100644 --- a/sdk/python/kfp/registry/registry_client.py +++ b/sdk/python/kfp/registry/registry_client.py @@ -195,7 +195,8 @@ class RegistryClient: return ApiAuth(auth_token) return None - def load_config(self, host: Optional[str], config_file: Optional[str]) -> dict: + def load_config(self, host: Optional[str], + config_file: Optional[str]) -> dict: """Loads the config. Args: @@ -285,8 +286,9 @@ class RegistryClient: return config return loaded_config - def _get_auth(self) -> Optional[Union[requests.auth.AuthBase, - credentials.Credentials]]: + def _get_auth( + self + ) -> Optional[Union[requests.auth.AuthBase, credentials.Credentials]]: """Helper function to convert google credentials to AuthBase class if needed. diff --git a/sdk/python/kfp/registry/registry_client_test.py b/sdk/python/kfp/registry/registry_client_test.py index 53668f3963..0628f34d62 100644 --- a/sdk/python/kfp/registry/registry_client_test.py +++ b/sdk/python/kfp/registry/registry_client_test.py @@ -100,11 +100,11 @@ class RegistryClientTest(parameterized.TestCase): 'get_version_url': ('https://artifactregistry.googleapis.com/v1/projects/' 'proj/locations/us-central1/repositories' - '/repo/packages/{package_name}/versions/{version}'), + '/repo/packages/{package_name}/versions/{version}?view=FULL'), 'list_versions_url': ('https://artifactregistry.googleapis.com/v1/projects/' 'proj/locations/us-central1/repositories' - '/repo/packages/{package_name}/versions'), + '/repo/packages/{package_name}/versions?view=FULL'), 'delete_version_url': ('https://artifactregistry.googleapis.com/v1/projects/' 'proj/locations/us-central1/repositories' @@ -278,7 +278,7 @@ class RegistryClientTest(parameterized.TestCase): mock_get.assert_called_once_with( url=('https://artifactregistry.googleapis.com/v1/projects/' 'proj/locations/us-central1/repositories' - '/repo/packages/pack/versions/sha256:abcde12345'), + '/repo/packages/pack/versions/sha256:abcde12345?view=FULL'), data='', headers=None, auth=mock.ANY) @@ -291,7 +291,7 @@ class RegistryClientTest(parameterized.TestCase): mock_get.assert_called_once_with( url=('https://artifactregistry.googleapis.com/v1/projects/' 'proj/locations/us-central1/repositories' - '/repo/packages/pack/versions'), + '/repo/packages/pack/versions?view=FULL'), data='', headers=None, auth=mock.ANY) @@ -309,7 +309,7 @@ class RegistryClientTest(parameterized.TestCase): mock_get.assert_called_once_with( url=('https://artifactregistry.googleapis.com/v1/projects/' 'proj/locations/us-central1/repositories' - '/repo/packages/pack/versions'), + '/repo/packages/pack/versions?view=FULL'), data='', headers=None, auth=mock.ANY)