From 498a271a97fad2331c36d56f65f4d717c1feb500 Mon Sep 17 00:00:00 2001 From: meredithslota Date: Sat, 1 Apr 2023 00:30:21 +0000 Subject: [PATCH 1/7] chore(docs): remove samples (#125) Samples have migrated to https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/optimization/snippets --- samples/snippets/async_api.py | 59 ---- samples/snippets/async_api_test.py | 49 --- samples/snippets/get_operation.py | 34 -- samples/snippets/get_operation_test.py | 41 --- samples/snippets/noxfile.py | 293 ------------------ samples/snippets/noxfile_config.py | 42 --- samples/snippets/requirements-test.txt | 2 - samples/snippets/requirements.txt | 2 - samples/snippets/resources/async_request.json | 33 -- .../resources/async_request_model.json | 114 ------- samples/snippets/resources/sync_request.json | 114 ------- samples/snippets/sync_api.py | 47 --- samples/snippets/sync_api_test.py | 29 -- .../snippets/sync_api_with_long_timeout.py | 51 --- .../sync_api_with_long_timeout_test.py | 29 -- 15 files changed, 939 deletions(-) delete mode 100644 samples/snippets/async_api.py delete mode 100644 samples/snippets/async_api_test.py delete mode 100644 samples/snippets/get_operation.py delete mode 100644 samples/snippets/get_operation_test.py delete mode 100644 samples/snippets/noxfile.py delete mode 100644 samples/snippets/noxfile_config.py delete mode 100644 samples/snippets/requirements-test.txt delete mode 100644 samples/snippets/requirements.txt delete mode 100644 samples/snippets/resources/async_request.json delete mode 100644 samples/snippets/resources/async_request_model.json delete mode 100644 samples/snippets/resources/sync_request.json delete mode 100644 samples/snippets/sync_api.py delete mode 100644 samples/snippets/sync_api_test.py delete mode 100644 samples/snippets/sync_api_with_long_timeout.py delete mode 100644 samples/snippets/sync_api_with_long_timeout_test.py diff --git a/samples/snippets/async_api.py b/samples/snippets/async_api.py deleted file mode 100644 index 8ab95b9..0000000 --- a/samples/snippets/async_api.py +++ /dev/null @@ -1,59 +0,0 @@ -# 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. - -# [START cloudoptimization_async_api] - -from google.api_core.exceptions import GoogleAPICallError -from google.cloud import optimization_v1 - -# TODO(developer): Uncomment these variables before running the sample. -# project_id= 'YOUR_PROJECT_ID' -# request_file_name = 'YOUR_REQUEST_FILE_NAME' -# request_model_gcs_path = 'gs://YOUR_PROJECT/YOUR_BUCKET/YOUR_REQUEST_MODEL_PATH' -# model_solution_gcs_path = 'gs://YOUR_PROJECT/YOUR_BUCKET/YOUR_SOLUCTION_PATH' - - -def call_async_api( - project_id: str, request_model_gcs_path: str, model_solution_gcs_path_prefix: str -) -> None: - """Call the async api for fleet routing.""" - # Use the default credentials for the environment to authenticate the client. - fleet_routing_client = optimization_v1.FleetRoutingClient() - request_file_name = "resources/async_request.json" - - with open(request_file_name, "r") as f: - fleet_routing_request = optimization_v1.BatchOptimizeToursRequest.from_json( - f.read() - ) - fleet_routing_request.parent = f"projects/{project_id}" - for idx, mc in enumerate(fleet_routing_request.model_configs): - mc.input_config.gcs_source.uri = request_model_gcs_path - model_solution_gcs_path = f"{model_solution_gcs_path_prefix}_{idx}" - mc.output_config.gcs_destination.uri = model_solution_gcs_path - - # The timeout argument for the gRPC call is independent from the `timeout` - # field in the request's OptimizeToursRequest message(s). - operation = fleet_routing_client.batch_optimize_tours(fleet_routing_request) - print(operation.operation.name) - - try: - # Block to wait for the job to finish. - result = operation.result() - print(result) - # Do you stuff. - except GoogleAPICallError: - print(operation.operation.error) - - -# [END cloudoptimization_async_api] diff --git a/samples/snippets/async_api_test.py b/samples/snippets/async_api_test.py deleted file mode 100644 index fce1b58..0000000 --- a/samples/snippets/async_api_test.py +++ /dev/null @@ -1,49 +0,0 @@ -# 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 uuid - -import google.auth -from google.cloud import storage -import pytest - -import async_api - - -# TODO(developer): Replace the variables in the file before use. -# A sample request model can be found at resources/async_request_model.json. -TEST_UUID = uuid.uuid4() -BUCKET = f"optimization-ai-{TEST_UUID}" -OUTPUT_PREFIX = f"code_snippets_test_output_{TEST_UUID}" -INPUT_URI = "gs://cloud-samples-data/optimization-ai/async_request_model.json" -BATCH_OUTPUT_URI_PREFIX = "gs://{}/{}/".format(BUCKET, OUTPUT_PREFIX) - - -@pytest.fixture(autouse=True) -def setup_teardown() -> None: - """Create a temporary bucket to store optimization output.""" - storage_client = storage.Client() - bucket = storage_client.create_bucket(BUCKET) - - yield - - bucket.delete(force=True) - - -def test_call_async_api(capsys: pytest.LogCaptureFixture) -> None: - _, project_id = google.auth.default() - async_api.call_async_api(project_id, INPUT_URI, BATCH_OUTPUT_URI_PREFIX) - out, _ = capsys.readouterr() - - assert "operations" in out diff --git a/samples/snippets/get_operation.py b/samples/snippets/get_operation.py deleted file mode 100644 index 7f20b96..0000000 --- a/samples/snippets/get_operation.py +++ /dev/null @@ -1,34 +0,0 @@ -# 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. - -# [START cloudoptimization_get_operation] -from google.cloud import optimization_v1 - - -def get_operation(operation_full_id: str) -> None: - """Get operation details and status.""" - # TODO(developer): Uncomment and set the following variables - # operation_full_id = \ - # "projects/[projectId]/operations/[operationId]" - - client = optimization_v1.FleetRoutingClient() - # Get the latest state of a long-running operation. - response = client.transport.operations_client.get_operation(operation_full_id) - - print("Name: {}".format(response.name)) - print("Operation details:") - print(response) - - -# [END cloudoptimization_get_operation] diff --git a/samples/snippets/get_operation_test.py b/samples/snippets/get_operation_test.py deleted file mode 100644 index e942e44..0000000 --- a/samples/snippets/get_operation_test.py +++ /dev/null @@ -1,41 +0,0 @@ -# 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 google.auth -from google.cloud import optimization_v1 -import pytest - -import get_operation - - -@pytest.fixture(scope="function") -def operation_id() -> str: - fleet_routing_client = optimization_v1.FleetRoutingClient() - - _, project_id = google.auth.default() - fleet_routing_request = {"parent": f"projects/{project_id}"} - - # Make the request - operation = fleet_routing_client.batch_optimize_tours(fleet_routing_request) - - yield operation.operation.name - - -def test_get_operation_status( - capsys: pytest.LogCaptureFixture, operation_id: str -) -> None: - get_operation.get_operation(operation_id) - out, _ = capsys.readouterr() - assert "Operation details" in out diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py deleted file mode 100644 index 1224cbe..0000000 --- a/samples/snippets/noxfile.py +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 2019 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 __future__ import print_function - -import glob -import os -from pathlib import Path -import sys -from typing import Callable, Dict, Optional - -import nox - - -# WARNING - WARNING - WARNING - WARNING - WARNING -# WARNING - WARNING - WARNING - WARNING - WARNING -# DO NOT EDIT THIS FILE EVER! -# WARNING - WARNING - WARNING - WARNING - WARNING -# WARNING - WARNING - WARNING - WARNING - WARNING - -BLACK_VERSION = "black==22.3.0" -ISORT_VERSION = "isort==5.10.1" - -# Copy `noxfile_config.py` to your directory and modify it instead. - -# `TEST_CONFIG` dict is a configuration hook that allows users to -# modify the test configurations. The values here should be in sync -# with `noxfile_config.py`. Users will copy `noxfile_config.py` into -# their directory and modify it. - -TEST_CONFIG = { - # You can opt out from the test for specific Python versions. - "ignored_versions": [], - # Old samples are opted out of enforcing Python type hints - # All new samples should feature them - "enforce_type_hints": False, - # An envvar key for determining the project id to use. Change it - # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a - # build specific Cloud project. You can also use your own string - # to use your own Cloud project. - "gcloud_project_env": "GOOGLE_CLOUD_PROJECT", - # 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT', - # If you need to use a specific version of pip, - # change pip_version_override to the string representation - # of the version number, for example, "20.2.4" - "pip_version_override": None, - # A dictionary you want to inject into your test. Don't put any - # secrets here. These values will override predefined values. - "envs": {}, -} - - -try: - # Ensure we can import noxfile_config in the project's directory. - sys.path.append(".") - from noxfile_config import TEST_CONFIG_OVERRIDE -except ImportError as e: - print("No user noxfile_config found: detail: {}".format(e)) - TEST_CONFIG_OVERRIDE = {} - -# Update the TEST_CONFIG with the user supplied values. -TEST_CONFIG.update(TEST_CONFIG_OVERRIDE) - - -def get_pytest_env_vars() -> Dict[str, str]: - """Returns a dict for pytest invocation.""" - ret = {} - - # Override the GCLOUD_PROJECT and the alias. - env_key = TEST_CONFIG["gcloud_project_env"] - # This should error out if not set. - ret["GOOGLE_CLOUD_PROJECT"] = os.environ[env_key] - - # Apply user supplied envs. - ret.update(TEST_CONFIG["envs"]) - return ret - - -# DO NOT EDIT - automatically generated. -# All versions used to test samples. -ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11"] - -# Any default versions that should be ignored. -IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"] - -TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS]) - -INSTALL_LIBRARY_FROM_SOURCE = os.environ.get("INSTALL_LIBRARY_FROM_SOURCE", False) in ( - "True", - "true", -) - -# Error if a python version is missing -nox.options.error_on_missing_interpreters = True - -# -# Style Checks -# - - -# Linting with flake8. -# -# We ignore the following rules: -# E203: whitespace before ‘:’ -# E266: too many leading ‘#’ for block comment -# E501: line too long -# I202: Additional newline in a section of imports -# -# We also need to specify the rules which are ignored by default: -# ['E226', 'W504', 'E126', 'E123', 'W503', 'E24', 'E704', 'E121'] -FLAKE8_COMMON_ARGS = [ - "--show-source", - "--builtin=gettext", - "--max-complexity=20", - "--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py", - "--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202", - "--max-line-length=88", -] - - -@nox.session -def lint(session: nox.sessions.Session) -> None: - if not TEST_CONFIG["enforce_type_hints"]: - session.install("flake8") - else: - session.install("flake8", "flake8-annotations") - - args = FLAKE8_COMMON_ARGS + [ - ".", - ] - session.run("flake8", *args) - - -# -# Black -# - - -@nox.session -def blacken(session: nox.sessions.Session) -> None: - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - python_files = [path for path in os.listdir(".") if path.endswith(".py")] - - session.run("black", *python_files) - - -# -# format = isort + black -# - - -@nox.session -def format(session: nox.sessions.Session) -> None: - """ - Run isort to sort imports. Then run black - to format code to uniform standard. - """ - session.install(BLACK_VERSION, ISORT_VERSION) - python_files = [path for path in os.listdir(".") if path.endswith(".py")] - - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections - session.run("isort", "--fss", *python_files) - session.run("black", *python_files) - - -# -# Sample Tests -# - - -PYTEST_COMMON_ARGS = ["--junitxml=sponge_log.xml"] - - -def _session_tests( - session: nox.sessions.Session, post_install: Callable = None -) -> None: - # check for presence of tests - test_list = glob.glob("**/*_test.py", recursive=True) + glob.glob( - "**/test_*.py", recursive=True - ) - test_list.extend(glob.glob("**/tests", recursive=True)) - - if len(test_list) == 0: - print("No tests found, skipping directory.") - return - - if TEST_CONFIG["pip_version_override"]: - pip_version = TEST_CONFIG["pip_version_override"] - session.install(f"pip=={pip_version}") - """Runs py.test for a particular project.""" - concurrent_args = [] - if os.path.exists("requirements.txt"): - if os.path.exists("constraints.txt"): - session.install("-r", "requirements.txt", "-c", "constraints.txt") - else: - session.install("-r", "requirements.txt") - with open("requirements.txt") as rfile: - packages = rfile.read() - - if os.path.exists("requirements-test.txt"): - if os.path.exists("constraints-test.txt"): - session.install("-r", "requirements-test.txt", "-c", "constraints-test.txt") - else: - session.install("-r", "requirements-test.txt") - with open("requirements-test.txt") as rtfile: - packages += rtfile.read() - - if INSTALL_LIBRARY_FROM_SOURCE: - session.install("-e", _get_repo_root()) - - if post_install: - post_install(session) - - if "pytest-parallel" in packages: - concurrent_args.extend(["--workers", "auto", "--tests-per-worker", "auto"]) - elif "pytest-xdist" in packages: - concurrent_args.extend(["-n", "auto"]) - - session.run( - "pytest", - *(PYTEST_COMMON_ARGS + session.posargs + concurrent_args), - # Pytest will return 5 when no tests are collected. This can happen - # on travis where slow and flaky tests are excluded. - # See http://doc.pytest.org/en/latest/_modules/_pytest/main.html - success_codes=[0, 5], - env=get_pytest_env_vars(), - ) - - -@nox.session(python=ALL_VERSIONS) -def py(session: nox.sessions.Session) -> None: - """Runs py.test for a sample using the specified version of Python.""" - if session.python in TESTED_VERSIONS: - _session_tests(session) - else: - session.skip( - "SKIPPED: {} tests are disabled for this sample.".format(session.python) - ) - - -# -# Readmegen -# - - -def _get_repo_root() -> Optional[str]: - """Returns the root folder of the project.""" - # Get root of this repository. Assume we don't have directories nested deeper than 10 items. - p = Path(os.getcwd()) - for i in range(10): - if p is None: - break - if Path(p / ".git").exists(): - return str(p) - # .git is not available in repos cloned via Cloud Build - # setup.py is always in the library's root, so use that instead - # https://github.com/googleapis/synthtool/issues/792 - if Path(p / "setup.py").exists(): - return str(p) - p = p.parent - raise Exception("Unable to detect repository root.") - - -GENERATED_READMES = sorted([x for x in Path(".").rglob("*.rst.in")]) - - -@nox.session -@nox.parametrize("path", GENERATED_READMES) -def readmegen(session: nox.sessions.Session, path: str) -> None: - """(Re-)generates the readme for a sample.""" - session.install("jinja2", "pyyaml") - dir_ = os.path.dirname(path) - - if os.path.exists(os.path.join(dir_, "requirements.txt")): - session.install("-r", os.path.join(dir_, "requirements.txt")) - - in_file = os.path.join(dir_, "README.rst.in") - session.run( - "python", _get_repo_root() + "/scripts/readme-gen/readme_gen.py", in_file - ) diff --git a/samples/snippets/noxfile_config.py b/samples/snippets/noxfile_config.py deleted file mode 100644 index 545546d..0000000 --- a/samples/snippets/noxfile_config.py +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2021 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. - -# Default TEST_CONFIG_OVERRIDE for python repos. - -# You can copy this file into your directory, then it will be imported from -# the noxfile.py. - -# The source of truth: -# https://github.com/GoogleCloudPlatform/python-docs-samples/blob/main/noxfile_config.py - -TEST_CONFIG_OVERRIDE = { - # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7", "3.6"], - # Old samples are opted out of enforcing Python type hints - # All new samples should feature them - "enforce_type_hints": True, - # An envvar key for determining the project id to use. Change it - # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a - # build specific Cloud project. You can also use your own string - # to use your own Cloud project. - "gcloud_project_env": "GOOGLE_CLOUD_PROJECT", - # 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT', - # If you need to use a specific version of pip, - # change pip_version_override to the string representation - # of the version number, for example, "20.2.4" - "pip_version_override": None, - # A dictionary you want to inject into your test. Don't put any - # secrets here. These values will override predefined values. - "envs": {}, -} diff --git a/samples/snippets/requirements-test.txt b/samples/snippets/requirements-test.txt deleted file mode 100644 index 36e1c4f..0000000 --- a/samples/snippets/requirements-test.txt +++ /dev/null @@ -1,2 +0,0 @@ -pytest==7.2.2 - diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt deleted file mode 100644 index 0f37846..0000000 --- a/samples/snippets/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -google-cloud-optimization==1.4.0 -google-cloud-storage==2.7.0 diff --git a/samples/snippets/resources/async_request.json b/samples/snippets/resources/async_request.json deleted file mode 100644 index 10ae1b0..0000000 --- a/samples/snippets/resources/async_request.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "parent": "projects/${YOUR_GCP_PROJECT_ID}", - "model_configs":[ - { - "input_config":{ - "gcs_source":{ - "uri":"${REQUEST_MODEL_GCS_PATH}" - }, - "data_format":"JSON" - }, - "output_config":{ - "gcs_destination":{ - "uri":"${MODEL_SOLUTION_GCS_PATH}" - }, - "data_format":"JSON" - } - }, - { - "input_config":{ - "gcs_source":{ - "uri":"${REQUEST_MODEL_GCS_PATH}" - }, - "data_format":"JSON" - }, - "output_config":{ - "gcs_destination":{ - "uri":"${MODEL_SOLUTION_GCS_PATH}" - }, - "data_format":"JSON" - } - } - ] - } \ No newline at end of file diff --git a/samples/snippets/resources/async_request_model.json b/samples/snippets/resources/async_request_model.json deleted file mode 100644 index 75c4b11..0000000 --- a/samples/snippets/resources/async_request_model.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "parent":"${YOUR_GCP_PROJECT_ID}", - "allowLargeDeadlineDespiteInterruptionRisk":true, - "model":{ - "shipments":[ - { - "deliveries":[ - { - "arrivalLocation":{ - "latitude":48.880941999999997, - "longitude":2.3238660000000002 - }, - "duration":"250s", - "timeWindows":[ - { - "endTime":"1970-01-01T01:06:40Z", - "startTime":"1970-01-01T00:50:00Z" - } - ] - } - ], - "loadDemands": { - "weight": { - "amount": "10" - } - }, - "pickups":[ - { - "arrivalLocation":{ - "latitude":48.874507000000001, - "longitude":2.3036099999999999 - }, - "duration":"150s", - "timeWindows":[ - { - "endTime":"1970-01-01T00:33:20Z", - "startTime":"1970-01-01T00:16:40Z" - } - ] - } - ] - }, - { - "deliveries":[ - { - "arrivalLocation":{ - "latitude":48.880940000000002, - "longitude":2.3238439999999998 - }, - "duration":"251s", - "timeWindows":[ - { - "endTime":"1970-01-01T01:06:41Z", - "startTime":"1970-01-01T00:50:01Z" - } - ] - } - ], - "loadDemands": { - "weight": { - "amount": "20" - } - }, - "pickups":[ - { - "arrivalLocation":{ - "latitude":48.880943000000002, - "longitude":2.3238669999999999 - }, - "duration":"151s", - "timeWindows":[ - { - "endTime":"1970-01-01T00:33:21Z", - "startTime":"1970-01-01T00:16:41Z" - } - ] - } - ] - } - ], - "vehicles":[ - { - "loadLimits": { - "weight": { - "maxLoad": 50 - } - }, - "endLocation":{ - "latitude":48.863109999999999, - "longitude":2.341205 - }, - "startLocation":{ - "latitude":48.863101999999998, - "longitude":2.3412039999999998 - } - }, - { - "loadLimits": { - "weight": { - "maxLoad": 60 - } - }, - "endLocation":{ - "latitude":48.863120000000002, - "longitude":2.341215 - }, - "startLocation":{ - "latitude":48.863112000000001, - "longitude":2.3412139999999999 - } - } - ] - } - } \ No newline at end of file diff --git a/samples/snippets/resources/sync_request.json b/samples/snippets/resources/sync_request.json deleted file mode 100644 index cbdf747..0000000 --- a/samples/snippets/resources/sync_request.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "parent": "projects/${YOUR_GCP_PROJECT_ID}", - "timeout": "15s", - "model": { - "shipments": [ - { - "deliveries": [ - { - "arrivalLocation": { - "latitude": 48.880942, - "longitude": 2.323866 - }, - "duration": "250s", - "timeWindows": [ - { - "endTime": "1970-01-01T01:06:40Z", - "startTime": "1970-01-01T00:50:00Z" - } - ] - } - ], - "loadDemands": { - "weight": { - "amount": "10" - } - }, - "pickups": [ - { - "arrivalLocation": { - "latitude": 48.874507, - "longitude": 2.30361 - }, - "duration": "150s", - "timeWindows": [ - { - "endTime": "1970-01-01T00:33:20Z", - "startTime": "1970-01-01T00:16:40Z" - } - ] - } - ] - }, - { - "deliveries": [ - { - "arrivalLocation": { - "latitude": 48.88094, - "longitude": 2.323844 - }, - "duration": "251s", - "timeWindows": [ - { - "endTime": "1970-01-01T01:06:41Z", - "startTime": "1970-01-01T00:50:01Z" - } - ] - } - ], - "loadDemands": { - "weight": { - "amount": "20" - } - }, - "pickups": [ - { - "arrivalLocation": { - "latitude": 48.880943, - "longitude": 2.323867 - }, - "duration": "151s", - "timeWindows": [ - { - "endTime": "1970-01-01T00:33:21Z", - "startTime": "1970-01-01T00:16:41Z" - } - ] - } - ] - } - ], - "vehicles": [ - { - "loadLimits": { - "weight": { - "maxLoad": 50 - } - }, - "endLocation": { - "latitude": 48.86311, - "longitude": 2.341205 - }, - "startLocation": { - "latitude": 48.863102, - "longitude": 2.341204 - } - }, - { - "loadLimits": { - "weight": { - "maxLoad": 60 - } - }, - "endLocation": { - "latitude": 48.86312, - "longitude": 2.341215 - }, - "startLocation": { - "latitude": 48.863112, - "longitude": 2.341214 - } - } - ] - } -} \ No newline at end of file diff --git a/samples/snippets/sync_api.py b/samples/snippets/sync_api.py deleted file mode 100644 index 187afd2..0000000 --- a/samples/snippets/sync_api.py +++ /dev/null @@ -1,47 +0,0 @@ -# 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. - -# [START cloudoptimization_sync_api] - -from google.cloud import optimization_v1 - -# TODO(developer): Uncomment these variables before running the sample. -# project_id= 'YOUR_PROJECT_ID' - - -def call_sync_api(project_id: str) -> None: - """Call the sync api for fleet routing.""" - # Use the default credentials for the environment. - # Change the file name to your request file. - request_file_name = "resources/sync_request.json" - fleet_routing_client = optimization_v1.FleetRoutingClient() - - with open(request_file_name, "r") as f: - # The request must include the `parent` field with the value set to - # 'projects/{YOUR_GCP_PROJECT_ID}'. - fleet_routing_request = optimization_v1.OptimizeToursRequest.from_json(f.read()) - fleet_routing_request.parent = f"projects/{project_id}" - # Send the request and print the response. - # Fleet Routing will return a response by the earliest of the `timeout` - # field in the request payload and the gRPC timeout specified below. - fleet_routing_response = fleet_routing_client.optimize_tours( - fleet_routing_request, timeout=100 - ) - print(fleet_routing_response) - # If you want to format the response to JSON, you can do the following: - # from google.protobuf.json_format import MessageToJson - # json_obj = MessageToJson(fleet_routing_response._pb) - - -# [END cloudoptimization_sync_api] diff --git a/samples/snippets/sync_api_test.py b/samples/snippets/sync_api_test.py deleted file mode 100644 index 6bfffc0..0000000 --- a/samples/snippets/sync_api_test.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 google.auth -import pytest - - -import sync_api - - -def test_call_sync_api(capsys: pytest.LogCaptureFixture) -> None: - _, project_id = google.auth.default() - sync_api.call_sync_api(project_id) - out, _ = capsys.readouterr() - - expected_strings = ["routes", "visits", "transitions", "metrics"] - for expected_string in expected_strings: - assert expected_string in out diff --git a/samples/snippets/sync_api_with_long_timeout.py b/samples/snippets/sync_api_with_long_timeout.py deleted file mode 100644 index ba658ff..0000000 --- a/samples/snippets/sync_api_with_long_timeout.py +++ /dev/null @@ -1,51 +0,0 @@ -# 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. - -# [START cloudoptimization_long_timeout] - -from google.cloud import optimization_v1 -from google.cloud.optimization_v1.services import fleet_routing -from google.cloud.optimization_v1.services.fleet_routing import transports -from google.cloud.optimization_v1.services.fleet_routing.transports import ( - grpc as fleet_routing_grpc, -) - -# TODO(developer): Uncomment these variables before running the sample. -# project_id= 'YOUR_PROJECT_ID' - - -def long_timeout(request_file_name: str, project_id: str) -> None: - with open(request_file_name, "r") as f: - fleet_routing_request = optimization_v1.OptimizeToursRequest.from_json(f.read()) - fleet_routing_request.parent = f"projects/{project_id}" - - # Create a channel to provide a connection to the Fleet Routing servers with - # custom behavior. The `grpc.keepalive_time_ms` channel argument modifies - # the channel behavior in order to send keep-alive pings every 5 minutes. - channel = fleet_routing_grpc.FleetRoutingGrpcTransport.create_channel( - options=[ - ("grpc.keepalive_time_ms", 500), - ("grpc.max_send_message_length", -1), - ("grpc.max_receive_message_length", -1), - ], - ) - # Keep-alive pings are sent on the transport. Create the transport using the - # custom channel The transport is essentially a wrapper to the channel. - transport = transports.FleetRoutingGrpcTransport(channel=channel) - client = fleet_routing.client.FleetRoutingClient(transport=transport) - fleet_routing_response = client.optimize_tours(fleet_routing_request) - print(fleet_routing_response) - - -# [END cloudoptimization_long_timeout] diff --git a/samples/snippets/sync_api_with_long_timeout_test.py b/samples/snippets/sync_api_with_long_timeout_test.py deleted file mode 100644 index 4955fa4..0000000 --- a/samples/snippets/sync_api_with_long_timeout_test.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 google.auth -import pytest - -import sync_api_with_long_timeout - - -def test_long_timeout(capsys: pytest.LogCaptureFixture) -> None: - request_file_name = "resources/sync_request.json" - _, project_id = google.auth.default() - sync_api_with_long_timeout.long_timeout(request_file_name, project_id) - out, _ = capsys.readouterr() - - expected_strings = ["routes", "visits", "transitions", "metrics"] - for expected_string in expected_strings: - assert expected_string in out From b55498900c96da5f6b950ba2393fcba1b7c6b0b5 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 16:24:12 +0000 Subject: [PATCH 2/7] build(deps): bump requests to 2.31.0 [autoapprove] (#127) Source-Link: https://togithub.com/googleapis/synthtool/commit/30bd01b4ab78bf1b2a425816e15b3e7e090993dd Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:9bc5fa3b62b091f60614c08a7fb4fd1d3e1678e326f34dd66ce1eefb5dc3267b --- .github/.OwlBot.lock.yaml | 3 ++- .kokoro/requirements.txt | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b8edda5..32b3c48 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:2e247c7bf5154df7f98cce087a20ca7605e236340c7d6d1a14447e5c06791bd6 + digest: sha256:9bc5fa3b62b091f60614c08a7fb4fd1d3e1678e326f34dd66ce1eefb5dc3267b +# created: 2023-05-25T14:56:16.294623272Z diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 66a2172..3b8d7ee 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -419,9 +419,9 @@ readme-renderer==37.3 \ --hash=sha256:cd653186dfc73055656f090f227f5cb22a046d7f71a841dfa305f55c9a513273 \ --hash=sha256:f67a16caedfa71eef48a31b39708637a6f4664c4394801a7b0d6432d13907343 # via twine -requests==2.28.1 \ - --hash=sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 \ - --hash=sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349 +requests==2.31.0 \ + --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ + --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 # via # gcp-releasetool # google-api-core From d0edb8787e636453bb2b413b6162ea8131ffa811 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Sat, 3 Jun 2023 21:46:30 +0000 Subject: [PATCH 3/7] build(deps): bump cryptography to 41.0.0 [autoapprove] (#129) Source-Link: https://togithub.com/googleapis/synthtool/commit/d0f51a0c2a9a6bcca86911eabea9e484baadf64b Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:240b5bcc2bafd450912d2da2be15e62bc6de2cf839823ae4bf94d4f392b451dc --- .github/.OwlBot.lock.yaml | 4 ++-- .kokoro/requirements.txt | 42 +++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 32b3c48..02a4ded 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:9bc5fa3b62b091f60614c08a7fb4fd1d3e1678e326f34dd66ce1eefb5dc3267b -# created: 2023-05-25T14:56:16.294623272Z + digest: sha256:240b5bcc2bafd450912d2da2be15e62bc6de2cf839823ae4bf94d4f392b451dc +# created: 2023-06-03T21:25:37.968717478Z diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 3b8d7ee..c7929db 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -113,28 +113,26 @@ commonmark==0.9.1 \ --hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60 \ --hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9 # via rich -cryptography==39.0.1 \ - --hash=sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4 \ - --hash=sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f \ - --hash=sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502 \ - --hash=sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41 \ - --hash=sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965 \ - --hash=sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e \ - --hash=sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc \ - --hash=sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad \ - --hash=sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505 \ - --hash=sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388 \ - --hash=sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6 \ - --hash=sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2 \ - --hash=sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac \ - --hash=sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695 \ - --hash=sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6 \ - --hash=sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336 \ - --hash=sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0 \ - --hash=sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c \ - --hash=sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106 \ - --hash=sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a \ - --hash=sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8 +cryptography==41.0.0 \ + --hash=sha256:0ddaee209d1cf1f180f1efa338a68c4621154de0afaef92b89486f5f96047c55 \ + --hash=sha256:14754bcdae909d66ff24b7b5f166d69340ccc6cb15731670435efd5719294895 \ + --hash=sha256:344c6de9f8bda3c425b3a41b319522ba3208551b70c2ae00099c205f0d9fd3be \ + --hash=sha256:34d405ea69a8b34566ba3dfb0521379b210ea5d560fafedf9f800a9a94a41928 \ + --hash=sha256:3680248309d340fda9611498a5319b0193a8dbdb73586a1acf8109d06f25b92d \ + --hash=sha256:3c5ef25d060c80d6d9f7f9892e1d41bb1c79b78ce74805b8cb4aa373cb7d5ec8 \ + --hash=sha256:4ab14d567f7bbe7f1cdff1c53d5324ed4d3fc8bd17c481b395db224fb405c237 \ + --hash=sha256:5c1f7293c31ebc72163a9a0df246f890d65f66b4a40d9ec80081969ba8c78cc9 \ + --hash=sha256:6b71f64beeea341c9b4f963b48ee3b62d62d57ba93eb120e1196b31dc1025e78 \ + --hash=sha256:7d92f0248d38faa411d17f4107fc0bce0c42cae0b0ba5415505df72d751bf62d \ + --hash=sha256:8362565b3835ceacf4dc8f3b56471a2289cf51ac80946f9087e66dc283a810e0 \ + --hash=sha256:84a165379cb9d411d58ed739e4af3396e544eac190805a54ba2e0322feb55c46 \ + --hash=sha256:88ff107f211ea696455ea8d911389f6d2b276aabf3231bf72c8853d22db755c5 \ + --hash=sha256:9f65e842cb02550fac96536edb1d17f24c0a338fd84eaf582be25926e993dde4 \ + --hash=sha256:a4fc68d1c5b951cfb72dfd54702afdbbf0fb7acdc9b7dc4301bbf2225a27714d \ + --hash=sha256:b7f2f5c525a642cecad24ee8670443ba27ac1fab81bba4cc24c7b6b41f2d0c75 \ + --hash=sha256:b846d59a8d5a9ba87e2c3d757ca019fa576793e8758174d3868aecb88d6fc8eb \ + --hash=sha256:bf8fc66012ca857d62f6a347007e166ed59c0bc150cefa49f28376ebe7d992a2 \ + --hash=sha256:f5d0bf9b252f30a31664b6f64432b4730bb7038339bd18b1fafe129cfc2be9be # via # gcp-releasetool # secretstorage From 1f1f5f0df6610c2c6120cd6cd8e6ae1317c2fb7c Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 13:16:22 +0000 Subject: [PATCH 4/7] chore: remove pinned Sphinx version [autoapprove] (#130) Source-Link: https://togithub.com/googleapis/synthtool/commit/909573ce9da2819eeb835909c795d29aea5c724e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:ddf4551385d566771dc713090feb7b4c1164fb8a698fe52bbe7670b24236565b --- .github/.OwlBot.lock.yaml | 4 ++-- noxfile.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 02a4ded..1b3cb6c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:240b5bcc2bafd450912d2da2be15e62bc6de2cf839823ae4bf94d4f392b451dc -# created: 2023-06-03T21:25:37.968717478Z + digest: sha256:ddf4551385d566771dc713090feb7b4c1164fb8a698fe52bbe7670b24236565b +# created: 2023-06-27T13:04:21.96690344Z diff --git a/noxfile.py b/noxfile.py index e9649dc..1fa0048 100644 --- a/noxfile.py +++ b/noxfile.py @@ -304,10 +304,9 @@ def docfx(session): session.install("-e", ".") session.install( - "sphinx==4.0.1", + "gcp-sphinx-docfx-yaml", "alabaster", "recommonmark", - "gcp-sphinx-docfx-yaml", ) shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) From 1c5e70063b0ee0cc8133cf851c205eb457174c3a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 17:34:36 +0000 Subject: [PATCH 5/7] chore: store artifacts in placer [autoapprove] (#131) Source-Link: https://togithub.com/googleapis/synthtool/commit/cb960373d12d20f8dc38beee2bf884d49627165e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:2d816f26f728ac8b24248741e7d4c461c09764ef9f7be3684d557c9632e46dbd --- .github/.OwlBot.lock.yaml | 4 ++-- .kokoro/release/common.cfg | 9 +++++++++ noxfile.py | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 1b3cb6c..98994f4 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:ddf4551385d566771dc713090feb7b4c1164fb8a698fe52bbe7670b24236565b -# created: 2023-06-27T13:04:21.96690344Z + digest: sha256:2d816f26f728ac8b24248741e7d4c461c09764ef9f7be3684d557c9632e46dbd +# created: 2023-06-28T17:03:33.371210701Z diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg index 74dfad2..b14f25b 100644 --- a/.kokoro/release/common.cfg +++ b/.kokoro/release/common.cfg @@ -38,3 +38,12 @@ env_vars: { key: "SECRET_MANAGER_KEYS" value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" } + +# Store the packages we uploaded to PyPI. That way, we have a record of exactly +# what we published, which we can use to generate SBOMs and attestations. +action { + define_artifacts { + regex: "github/python-optimization/**/*.tar.gz" + strip_prefix: "github/python-optimization" + } +} diff --git a/noxfile.py b/noxfile.py index 1fa0048..715640f 100644 --- a/noxfile.py +++ b/noxfile.py @@ -378,6 +378,7 @@ def prerelease_deps(session): "grpcio!=1.52.0rc1", "grpcio-status", "google-api-core", + "google-auth", "proto-plus", "google-cloud-testutils", # dependencies of google-cloud-testutils" @@ -390,7 +391,6 @@ def prerelease_deps(session): # Remaining dependencies other_deps = [ "requests", - "google-auth", ] session.install(*other_deps) From ec8db55d32c1ad95ca2dfcc82d96e0978d30c128 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 13:26:38 -0400 Subject: [PATCH 6/7] fix: Add async context manager return types (#132) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Add async context manager return types chore: Mock return_value should not populate oneof message fields chore: Support snippet generation for services that only support REST transport chore: Update gapic-generator-python to v1.11.0 PiperOrigin-RevId: 545430278 Source-Link: https://github.com/googleapis/googleapis/commit/601b5326107eeb74800b426d1f9933faa233258a Source-Link: https://github.com/googleapis/googleapis-gen/commit/b3f18d0f6560a855022fd058865e7620479d7af9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjNmMThkMGY2NTYwYTg1NTAyMmZkMDU4ODY1ZTc2MjA0NzlkN2FmOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../optimization_v1/services/fleet_routing/async_client.py | 2 +- .../snippet_metadata_google.cloud.optimization.v1.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google/cloud/optimization_v1/services/fleet_routing/async_client.py b/google/cloud/optimization_v1/services/fleet_routing/async_client.py index cbae5cc..b071131 100644 --- a/google/cloud/optimization_v1/services/fleet_routing/async_client.py +++ b/google/cloud/optimization_v1/services/fleet_routing/async_client.py @@ -519,7 +519,7 @@ async def get_operation( # Done; return the response. return response - async def __aenter__(self): + async def __aenter__(self) -> "FleetRoutingAsyncClient": return self async def __aexit__(self, exc_type, exc, tb): diff --git a/samples/generated_samples/snippet_metadata_google.cloud.optimization.v1.json b/samples/generated_samples/snippet_metadata_google.cloud.optimization.v1.json index 6d95bf2..d38082d 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.optimization.v1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.optimization.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-optimization", - "version": "1.4.1" + "version": "0.1.0" }, "snippets": [ { From e896127f6d30f22b130238ed3f9ae62b1fe24ab6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 11:04:54 -0400 Subject: [PATCH 7/7] chore(main): release 1.4.2 (#133) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- CHANGELOG.md | 7 +++++++ google/cloud/optimization/gapic_version.py | 2 +- google/cloud/optimization_v1/gapic_version.py | 2 +- .../snippet_metadata_google.cloud.optimization.v1.json | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 4918b25..efe9bfb 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "1.4.1" + ".": "1.4.2" } diff --git a/CHANGELOG.md b/CHANGELOG.md index c9454b1..f54c5ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.4.2](https://github.com/googleapis/python-optimization/compare/v1.4.1...v1.4.2) (2023-07-04) + + +### Bug Fixes + +* Add async context manager return types ([#132](https://github.com/googleapis/python-optimization/issues/132)) ([ec8db55](https://github.com/googleapis/python-optimization/commit/ec8db55d32c1ad95ca2dfcc82d96e0978d30c128)) + ## [1.4.1](https://github.com/googleapis/python-optimization/compare/v1.4.0...v1.4.1) (2023-03-23) diff --git a/google/cloud/optimization/gapic_version.py b/google/cloud/optimization/gapic_version.py index dc24d9a..f45c3f6 100644 --- a/google/cloud/optimization/gapic_version.py +++ b/google/cloud/optimization/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.4.1" # {x-release-please-version} +__version__ = "1.4.2" # {x-release-please-version} diff --git a/google/cloud/optimization_v1/gapic_version.py b/google/cloud/optimization_v1/gapic_version.py index dc24d9a..f45c3f6 100644 --- a/google/cloud/optimization_v1/gapic_version.py +++ b/google/cloud/optimization_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.4.1" # {x-release-please-version} +__version__ = "1.4.2" # {x-release-please-version} diff --git a/samples/generated_samples/snippet_metadata_google.cloud.optimization.v1.json b/samples/generated_samples/snippet_metadata_google.cloud.optimization.v1.json index d38082d..9969f4e 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.optimization.v1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.optimization.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-optimization", - "version": "0.1.0" + "version": "1.4.2" }, "snippets": [ {