chore: remove matching engine add copyright header (googleapis#1137)

morgandu · web-flow · commit 936ddf87f975 · 2022-04-05T20:36:10.000Z
diff --git a/.sample_configs/param_handlers/create_batch_prediction_job_tabular_forecasting_sample.py b/.sample_configs/param_handlers/create_batch_prediction_job_tabular_forecasting_sample.py
@@ -1,3 +1,18 @@
+# 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.
+#
+
 def make_parent(parent: str) -> str:
     parent = parent
 
diff --git a/google/cloud/aiplatform/__init__.py b/google/cloud/aiplatform/__init__.py
@@ -38,10 +38,6 @@
     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
@@ -108,8 +104,6 @@
     "EntityType",
     "Feature",
     "Featurestore",
-    "MatchingEngineIndex",
-    "MatchingEngineIndexEndpoint",
     "ImageDataset",
     "HyperparameterTuningJob",
     "Model",
diff --git a/google/cloud/aiplatform/_matching_engine/__init__.py b/google/cloud/aiplatform/_matching_engine/__init__.py
@@ -15,15 +15,15 @@
 # limitations under the License.
 #
 
-from google.cloud.aiplatform.matching_engine.matching_engine_index import (
+from google.cloud.aiplatform._matching_engine.matching_engine_index import (
     MatchingEngineIndex,
 )
-from google.cloud.aiplatform.matching_engine.matching_engine_index_config import (
+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 (
+from google.cloud.aiplatform._matching_engine.matching_engine_index_endpoint import (
     MatchingEngineIndexEndpoint,
 )
 
diff --git a/google/cloud/aiplatform/_matching_engine/match_service_pb2.py b/google/cloud/aiplatform/_matching_engine/match_service_pb2.py
@@ -1,4 +1,19 @@
 # -*- 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.
+#
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: match_service.proto
 """Generated protocol buffer code."""
diff --git a/google/cloud/aiplatform/_matching_engine/match_service_pb2_grpc.py b/google/cloud/aiplatform/_matching_engine/match_service_pb2_grpc.py
@@ -1,6 +1,22 @@
+# -*- 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.
+#
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 """Client and server classes corresponding to protobuf-defined services."""
-from google.cloud.aiplatform.matching_engine import match_service_pb2
+from google.cloud.aiplatform._matching_engine import match_service_pb2
 
 import grpc
 
diff --git a/google/cloud/aiplatform/_matching_engine/matching_engine_index.py b/google/cloud/aiplatform/_matching_engine/matching_engine_index.py
@@ -25,7 +25,7 @@
     matching_engine_index as gca_matching_engine_index,
 )
 from google.cloud.aiplatform import initializer
-from google.cloud.aiplatform.matching_engine import matching_engine_index_config
+from google.cloud.aiplatform._matching_engine import matching_engine_index_config
 from google.cloud.aiplatform import utils
 
 _LOGGER = base.Logger(__name__)
diff --git a/google/cloud/aiplatform/_matching_engine/matching_engine_index_config.py b/google/cloud/aiplatform/_matching_engine/matching_engine_index_config.py
diff --git a/google/cloud/aiplatform/_matching_engine/matching_engine_index_endpoint.py b/google/cloud/aiplatform/_matching_engine/matching_engine_index_endpoint.py
@@ -21,14 +21,14 @@
 from google.auth import credentials as auth_credentials
 from google.cloud.aiplatform import base
 from google.cloud.aiplatform import initializer
-from google.cloud.aiplatform import matching_engine
+from google.cloud.aiplatform import _matching_engine
 from google.cloud.aiplatform import utils
 from google.cloud.aiplatform.compat.types import (
     machine_resources as gca_machine_resources_compat,
     matching_engine_index_endpoint as gca_matching_engine_index_endpoint,
 )
-from google.cloud.aiplatform.matching_engine import match_service_pb2
-from google.cloud.aiplatform.matching_engine import match_service_pb2_grpc
+from google.cloud.aiplatform._matching_engine import match_service_pb2
+from google.cloud.aiplatform._matching_engine import match_service_pb2_grpc
 from google.protobuf import field_mask_pb2
 
 import grpc
@@ -432,7 +432,7 @@ def _build_deployed_index(
 
     def deploy_index(
         self,
-        index: matching_engine.MatchingEngineIndex,
+        index: _matching_engine.MatchingEngineIndex,
         deployed_index_id: str,
         display_name: Optional[str] = None,
         machine_type: Optional[str] = None,
diff --git a/samples/snippets/helpers.py b/samples/snippets/helpers.py
@@ -1,3 +1,20 @@
+# -*- 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.
+#
+
 import collections
 import re
 import time
diff --git a/scripts/run_flaky_test_diagnostic.py b/scripts/run_flaky_test_diagnostic.py
@@ -1,3 +1,18 @@
+# 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.
+#
+
 import os
 import pathlib
 import sys
diff --git a/tests/system/aiplatform/test_matching_engine_index.py b/tests/system/aiplatform/test_matching_engine_index.py
@@ -16,6 +16,7 @@
 #
 
 import uuid
+import pytest
 
 from google.cloud import aiplatform
 
@@ -166,6 +167,7 @@
 ]
 
 
+@pytest.mark.skip(reason="TestMatchingEngine not available")
 class TestMatchingEngine(e2e_base.TestEndToEnd):
 
     _temp_prefix = "temp_vertex_sdk_e2e_matching_engine_test"
diff --git a/tests/unit/aiplatform/test_automl_forecasting_training_jobs.py b/tests/unit/aiplatform/test_automl_forecasting_training_jobs.py
@@ -1,3 +1,20 @@
+# -*- 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.
+#
+
 import importlib
 import pytest
 from unittest import mock
diff --git a/tests/unit/aiplatform/test_automl_image_training_jobs.py b/tests/unit/aiplatform/test_automl_image_training_jobs.py
@@ -1,3 +1,20 @@
+# -*- 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.
+#
+
 import pytest
 import importlib
 from unittest import mock
diff --git a/tests/unit/aiplatform/test_automl_tabular_training_jobs.py b/tests/unit/aiplatform/test_automl_tabular_training_jobs.py
@@ -1,3 +1,20 @@
+# -*- 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.
+#
+
 import importlib
 import pytest
 from unittest import mock
diff --git a/tests/unit/aiplatform/test_automl_text_training_jobs.py b/tests/unit/aiplatform/test_automl_text_training_jobs.py
@@ -1,3 +1,20 @@
+# -*- 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.
+#
+
 import pytest
 import importlib
 from unittest import mock
diff --git a/tests/unit/aiplatform/test_automl_video_training_jobs.py b/tests/unit/aiplatform/test_automl_video_training_jobs.py
@@ -1,3 +1,20 @@
+# -*- 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.
+#
+
 import pytest
 import importlib
 from unittest import mock
diff --git a/tests/unit/aiplatform/test_matching_engine_index.py b/tests/unit/aiplatform/test_matching_engine_index.py
@@ -167,6 +167,7 @@ def create_index_mock():
         yield create_index_mock
 
 
+@pytest.mark.skip(reason="MatchingEngineIndex not available")
 class TestMatchingEngineIndex:
     def setup_method(self):
         reload(initializer)
diff --git a/tests/unit/aiplatform/test_matching_engine_index_endpoint.py b/tests/unit/aiplatform/test_matching_engine_index_endpoint.py
@@ -383,6 +383,7 @@ def create_index_endpoint_mock():
         yield create_index_endpoint_mock
 
 
+@pytest.mark.skip(reason="MatchingEngineIndexEndpoint not available")
 class TestMatchingEngineIndexEndpoint:
     def setup_method(self):
         reload(initializer)

Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@`
`15`	`15`	`# limitations under the License.`
`16`	`16`	`#`
`17`	`17`
`18`		`-from google.cloud.aiplatform.matching_engine.matching_engine_index import (`
	`18`	`+from google.cloud.aiplatform._matching_engine.matching_engine_index import (`
`19`	`19`	`MatchingEngineIndex,`
`20`	`20`	`)`
`21`		`-from google.cloud.aiplatform.matching_engine.matching_engine_index_config import (`
	`21`	`+from google.cloud.aiplatform._matching_engine.matching_engine_index_config import (`
`22`	`22`	`BruteForceConfig as MatchingEngineBruteForceAlgorithmConfig,`
`23`	`23`	`MatchingEngineIndexConfig as MatchingEngineIndexConfig,`
`24`	`24`	`TreeAhConfig as MatchingEngineTreeAhAlgorithmConfig,`
`25`	`25`	`)`
`26`		`-from google.cloud.aiplatform.matching_engine.matching_engine_index_endpoint import (`
	`26`	`+from google.cloud.aiplatform._matching_engine.matching_engine_index_endpoint import (`
`27`	`27`	`MatchingEngineIndexEndpoint,`
`28`	`28`	`)`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`matching_engine_index as gca_matching_engine_index,`
`26`	`26`	`)`
`27`	`27`	`from google.cloud.aiplatform import initializer`
`28`		`-from google.cloud.aiplatform.matching_engine import matching_engine_index_config`
	`28`	`+from google.cloud.aiplatform._matching_engine import matching_engine_index_config`
`29`	`29`	`from google.cloud.aiplatform import utils`
`30`	`30`
`31`	`31`	`_LOGGER = base.Logger(__name__)`