Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
605d606
Added matching engine index
ivanmkc Feb 2, 2022
dd47284
Added matching engine index endpoint
ivanmkc Feb 2, 2022
847b620
Added deploy_index and undeploy_index to MatchingEngineIndexEndpoint
ivanmkc Feb 2, 2022
edd2c27
Added mutate_deployed_index to MatchingEngineIndexEndpoint
ivanmkc Feb 2, 2022
5fb24f6
Fixed logging
ivanmkc Feb 2, 2022
12000f7
Added unit tests
ivanmkc Feb 2, 2022
5914825
Removed unneeded parameter
ivanmkc Feb 2, 2022
fc9e507
Fixed tests
ivanmkc Feb 2, 2022
8c7da3a
Fixed compat types for matching engine
ivanmkc Feb 2, 2022
8db9e45
Added test_matching_engine_index_endpoint.py
ivanmkc Feb 2, 2022
5531bbd
Initial integration test for matching engine added
ivanmkc Feb 2, 2022
295a760
Added metadata parameters to MatchingEngineIndex
ivanmkc Feb 2, 2022
e8393b9
Added unit tests for config
ivanmkc Feb 2, 2022
de956b8
Fixes to integration test
ivanmkc Feb 2, 2022
175d9ea
Added missing config file
ivanmkc Feb 2, 2022
b3dc07a
Cleaned up docstrings and removed immutable update parameters
ivanmkc Feb 3, 2022
e5ad43a
Removed metadata_schema_uri
ivanmkc Feb 3, 2022
5d2d69e
Various matching engine fixes
ivanmkc Feb 4, 2022
7394dc0
Finished main logic for MatchingEngineIndex
ivanmkc Feb 4, 2022
0bf0744
Fixed deployment test
ivanmkc Feb 14, 2022
c8cd8dc
Added matching engine deployment and tests
ivanmkc Feb 15, 2022
fa9bacf
Added undeploy_all tests
ivanmkc Feb 15, 2022
fa66cd0
Fixed e2e matching engine test
ivanmkc Feb 15, 2022
c111d81
Improved tests and docstrings
ivanmkc Feb 15, 2022
0dce529
Test cleanup and removal of unused mutate_deployed_index parameters
ivanmkc Feb 15, 2022
076cd5b
fix: Updated docstrings
ivanmkc Feb 15, 2022
f3d737b
Updated copyright
ivanmkc Feb 15, 2022
5d9cd0b
Improved comments
ivanmkc Feb 15, 2022
c040f72
Removed index_id paramater
ivanmkc Feb 15, 2022
55d6f86
Fixed update bug
ivanmkc Feb 16, 2022
276d5e3
Removed unneeded id parameters
ivanmkc Feb 16, 2022
734ec75
Added prediction service
ivanmkc Feb 16, 2022
1477345
Update tests
ivanmkc Feb 17, 2022
8063d69
Ran linter
ivanmkc Feb 17, 2022
6206c45
Removed enable_private_service_connect parameter as it will be deprec…
ivanmkc Feb 17, 2022
2b36ec0
Cleaned up tests
ivanmkc Feb 17, 2022
6c7fc9a
Fixed test
ivanmkc Feb 17, 2022
21d1e7b
Added teardown and network code
ivanmkc Feb 17, 2022
866b5d1
Fixed undeploy
ivanmkc Feb 17, 2022
b60ea61
Match tweaks
ivanmkc Feb 18, 2022
56e4413
Removed batch match test for now
ivanmkc Feb 18, 2022
3240bf4
Added MatchingEngineIndexConfig to init
ivanmkc Feb 18, 2022
753cd27
Removed unneeded index_id parameter on mutate_deployed_index
ivanmkc Feb 18, 2022
e9865ca
Fixed imports
ivanmkc Feb 19, 2022
ae330f4
Switched to returning MatchNeighbor's
ivanmkc Feb 19, 2022
8466d16
Import tweaks
ivanmkc Feb 19, 2022
0ee4b46
Ran linter
ivanmkc Feb 21, 2022
724119e
Cleaned up tests
ivanmkc Feb 21, 2022
bd17ccc
Added comments
ivanmkc Feb 21, 2022
dba3606
Fixed lint issues
ivanmkc Feb 22, 2022
f3ef1f9
Lint
ivanmkc Feb 22, 2022
2c1ca56
Updated copyright
ivanmkc Feb 22, 2022
3d9b6e7
Added remaining docstrings
ivanmkc Feb 22, 2022
5b3ac29
Reverted unwanted change
ivanmkc Feb 22, 2022
a974a27
Fixed comment
ivanmkc Feb 22, 2022
442a8fb
Added undeploy step for index_endpoint system test
ivanmkc Feb 22, 2022
d986dfa
Added more system tests
ivanmkc Feb 22, 2022
e70facf
Fixed lint issues
ivanmkc Feb 22, 2022
09480f2
Added unique id to prevent conflicts
ivanmkc Feb 23, 2022
4515335
Addressed PR comments
ivanmkc Feb 23, 2022
786e48b
Reordered imports
ivanmkc Feb 23, 2022
cab14fd
Fixed init file
ivanmkc Feb 25, 2022
9255559
Fix lint and brute_force issue
ivanmkc Feb 25, 2022
5c042b8
Addressed PR comments
ivanmkc Feb 25, 2022
35b2fda
Remove unused parameter
ivanmkc Feb 25, 2022
ecbbb04
Fixed system test
ivanmkc Feb 28, 2022
cff0e32
Removed vpc reliant system tests
ivanmkc Mar 4, 2022
b142ef8
Fixed unit tests
ivanmkc Mar 5, 2022
a35ed6b
Fixed lint error
ivanmkc Mar 7, 2022
9c8852c
Fixed test
ivanmkc Mar 8, 2022
5b34124
Fixed lint issues
ivanmkc Mar 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions google/cloud/aiplatform/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
Feature,
Featurestore,
)
from google.cloud.aiplatform.matching_engine import (
MatchingEngineIndex,
MatchingEngineIndexEndpoint,
)
from google.cloud.aiplatform.metadata import metadata
from google.cloud.aiplatform.models import Endpoint
from google.cloud.aiplatform.models import Model
Expand Down Expand Up @@ -104,6 +108,8 @@
"EntityType",
"Feature",
"Featurestore",
"MatchingEngineIndex",
"MatchingEngineIndexEndpoint",
"ImageDataset",
"HyperparameterTuningJob",
"Model",
Expand Down
10 changes: 10 additions & 0 deletions google/cloud/aiplatform/compat/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@
types.job_state = types.job_state_v1beta1
types.machine_resources = types.machine_resources_v1beta1
types.manual_batch_tuning_parameters = types.manual_batch_tuning_parameters_v1beta1
types.matching_engine_deployed_index_ref = (
types.matching_engine_deployed_index_ref_v1beta1
)
types.matching_engine_index = types.matching_engine_index_v1beta1
types.matching_engine_index_endpoint = types.matching_engine_index_endpoint_v1beta1
types.metadata_service = types.metadata_service_v1beta1
types.metadata_store = types.metadata_store_v1beta1
types.model = types.model_v1beta1
Expand Down Expand Up @@ -147,6 +152,11 @@
types.job_state = types.job_state_v1
types.machine_resources = types.machine_resources_v1
types.manual_batch_tuning_parameters = types.manual_batch_tuning_parameters_v1
types.matching_engine_deployed_index_ref = (
types.matching_engine_deployed_index_ref_v1
)
types.matching_engine_index = types.matching_engine_index_v1
types.matching_engine_index_endpoint = types.matching_engine_index_endpoint_v1
types.metadata_service = types.metadata_service_v1
types.metadata_store = types.metadata_store_v1
types.model = types.model_v1
Expand Down
16 changes: 16 additions & 0 deletions google/cloud/aiplatform/compat/services/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
from google.cloud.aiplatform_v1beta1.services.featurestore_service import (
client as featurestore_service_client_v1beta1,
)
from google.cloud.aiplatform_v1beta1.services.index_service import (
client as index_service_client_v1beta1,
)
from google.cloud.aiplatform_v1beta1.services.index_endpoint_service import (
client as index_endpoint_service_client_v1beta1,
)
from google.cloud.aiplatform_v1beta1.services.job_service import (
client as job_service_client_v1beta1,
)
Expand Down Expand Up @@ -61,6 +67,12 @@
from google.cloud.aiplatform_v1.services.featurestore_service import (
client as featurestore_service_client_v1,
)
from google.cloud.aiplatform_v1.services.index_service import (
client as index_service_client_v1,
)
from google.cloud.aiplatform_v1.services.index_endpoint_service import (
client as index_endpoint_service_client_v1,
)
from google.cloud.aiplatform_v1.services.job_service import (
client as job_service_client_v1,
)
Expand Down Expand Up @@ -89,6 +101,8 @@
endpoint_service_client_v1,
featurestore_online_serving_service_client_v1,
featurestore_service_client_v1,
index_service_client_v1,
index_endpoint_service_client_v1,
job_service_client_v1,
metadata_service_client_v1,
model_service_client_v1,
Expand All @@ -101,6 +115,8 @@
endpoint_service_client_v1beta1,
featurestore_online_serving_service_client_v1beta1,
featurestore_service_client_v1beta1,
index_service_client_v1beta1,
index_endpoint_service_client_v1beta1,
job_service_client_v1beta1,
model_service_client_v1beta1,
pipeline_service_client_v1beta1,
Expand Down
12 changes: 12 additions & 0 deletions google/cloud/aiplatform/compat/types/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
data_labeling_job as data_labeling_job_v1beta1,
dataset as dataset_v1beta1,
dataset_service as dataset_service_v1beta1,
deployed_index_ref as matching_engine_deployed_index_ref_v1beta1,
deployed_model_ref as deployed_model_ref_v1beta1,
encryption_spec as encryption_spec_v1beta1,
endpoint as endpoint_v1beta1,
Expand All @@ -45,6 +46,8 @@
featurestore_monitoring as featurestore_monitoring_v1beta1,
featurestore_online_service as featurestore_online_service_v1beta1,
featurestore_service as featurestore_service_v1beta1,
index as matching_engine_index_v1beta1,
index_endpoint as matching_engine_index_endpoint_v1beta1,
hyperparameter_tuning_job as hyperparameter_tuning_job_v1beta1,
io as io_v1beta1,
job_service as job_service_v1beta1,
Expand Down Expand Up @@ -86,6 +89,7 @@
data_labeling_job as data_labeling_job_v1,
dataset as dataset_v1,
dataset_service as dataset_service_v1,
deployed_index_ref as matching_engine_deployed_index_ref_v1,
deployed_model_ref as deployed_model_ref_v1,
encryption_spec as encryption_spec_v1,
endpoint as endpoint_v1,
Expand All @@ -103,6 +107,8 @@
featurestore_online_service as featurestore_online_service_v1,
featurestore_service as featurestore_service_v1,
hyperparameter_tuning_job as hyperparameter_tuning_job_v1,
index as matching_engine_index_v1,
index_endpoint as matching_engine_index_endpoint_v1,
io as io_v1,
job_service as job_service_v1,
job_state as job_state_v1,
Expand Down Expand Up @@ -167,6 +173,9 @@
job_state_v1,
machine_resources_v1,
manual_batch_tuning_parameters_v1,
matching_engine_deployed_index_ref_v1,
matching_engine_index_v1,
matching_engine_index_endpoint_v1,
metadata_service_v1,
metadata_store_v1,
model_v1,
Expand Down Expand Up @@ -223,6 +232,9 @@
job_state_v1beta1,
machine_resources_v1beta1,
manual_batch_tuning_parameters_v1beta1,
matching_engine_deployed_index_ref_v1beta1,
matching_engine_index_v1beta1,
matching_engine_index_endpoint_v1beta1,
metadata_service_v1beta1,
metadata_store_v1beta1,
model_v1beta1,
Expand Down
36 changes: 36 additions & 0 deletions google/cloud/aiplatform/matching_engine/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# -*- coding: utf-8 -*-

# Copyright 2022 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

from google.cloud.aiplatform.matching_engine.matching_engine_index import (
MatchingEngineIndex,
)
from google.cloud.aiplatform.matching_engine.matching_engine_index_config import (
BruteForceConfig as MatchingEngineBruteForceAlgorithmConfig,
MatchingEngineIndexConfig as MatchingEngineIndexConfig,
TreeAhConfig as MatchingEngineTreeAhAlgorithmConfig,
)
from google.cloud.aiplatform.matching_engine.matching_engine_index_endpoint import (
MatchingEngineIndexEndpoint,
)

__all__ = (
"MatchingEngineIndex",
"MatchingEngineIndexEndpoint",
"MatchingEngineIndexConfig",
"MatchingEngineBruteForceAlgorithmConfig",
"MatchingEngineTreeAhAlgorithmConfig",
)
Loading