diff --git a/.generator/Dockerfile b/.generator/Dockerfile index 1dfaa731eccc..9856ac549360 100644 --- a/.generator/Dockerfile +++ b/.generator/Dockerfile @@ -139,4 +139,5 @@ RUN chmod a+rx ./cli.py COPY .generator/parse_googleapis_content.py . RUN chmod a+rx ./parse_googleapis_content.py +ENV ENABLE_PERF_LOGS=1 ENTRYPOINT ["python3.14", "./cli.py"] diff --git a/.generator/cli.py b/.generator/cli.py index 48d6776594f0..06d035392a41 100644 --- a/.generator/cli.py +++ b/.generator/cli.py @@ -23,6 +23,7 @@ import subprocess import sys import tempfile +import time import yaml from datetime import date, datetime from functools import lru_cache @@ -31,6 +32,40 @@ import build.util import parse_googleapis_content +logging.basicConfig(stream=sys.stdout, level=logging.INFO) + +import functools + +PERF_LOGGING_ENABLED = os.environ.get("ENABLE_PERF_LOGS") == "1" + +if PERF_LOGGING_ENABLED: + perf_logger = logging.getLogger("performance_metrics") + perf_logger.setLevel(logging.INFO) + perf_handler = logging.FileHandler("performance_metrics.log", mode='w') + perf_formatter = logging.Formatter('%(asctime)s | %(message)s', datefmt='%H:%M:%S') + perf_handler.setFormatter(perf_formatter) + perf_logger.addHandler(perf_handler) + perf_logger.propagate = False + +def track_time(func): + """ + Decorator. Usage: @track_time + If logging is OFF, it returns the original function (Zero Overhead). + If logging is ON, it wraps the function to measure execution time. + """ + if not PERF_LOGGING_ENABLED: + return func + + @functools.wraps(func) + def wrapper(*args, **kwargs): + start_time = time.perf_counter() + try: + return func(*args, **kwargs) + finally: + duration = time.perf_counter() - start_time + perf_logger.info(f"{func.__name__:<30} | {duration:.4f} seconds") + + return wrapper try: import synthtool @@ -320,6 +355,7 @@ def _get_library_id(request_data: Dict) -> str: return library_id +@track_time def _run_post_processor(output: str, library_id: str, is_mono_repo: bool): """Runs the synthtool post-processor on the output directory. @@ -389,6 +425,7 @@ def _add_header_to_files(directory: str) -> None: f.writelines(lines) +@track_time def _copy_files_needed_for_post_processing( output: str, input: str, library_id: str, is_mono_repo: bool ): @@ -435,6 +472,7 @@ def _copy_files_needed_for_post_processing( ) +@track_time def _clean_up_files_after_post_processing( output: str, library_id: str, is_mono_repo: bool ): @@ -581,6 +619,7 @@ def _get_repo_name_from_repo_metadata(base: str, library_id: str, is_mono_repo: return repo_name +@track_time def _generate_repo_metadata_file( output: str, library_id: str, source: str, apis: List[Dict], is_mono_repo: bool ): @@ -622,6 +661,7 @@ def _generate_repo_metadata_file( _write_json_file(output_repo_metadata, metadata_content) +@track_time def _copy_readme_to_docs(output: str, library_id: str, is_mono_repo: bool): """Copies the README.rst file for a generated library to docs/README.rst. @@ -663,6 +703,7 @@ def _copy_readme_to_docs(output: str, library_id: str, is_mono_repo: bool): f.write(content) +@track_time def handle_generate( librarian: str = LIBRARIAN_DIR, source: str = SOURCE_DIR, @@ -711,6 +752,7 @@ def handle_generate( _run_post_processor(output, library_id, is_mono_repo) _copy_readme_to_docs(output, library_id, is_mono_repo) _clean_up_files_after_post_processing(output, library_id, is_mono_repo) + except Exception as e: raise ValueError("Generation failed.") from e logger.info("'generate' command executed.") @@ -924,6 +966,7 @@ def _stage_gapic_library(tmp_dir: str, staging_dir: str) -> None: shutil.copytree(tmp_dir, staging_dir, dirs_exist_ok=True) +@track_time def _generate_api( api_path: str, library_id: str, @@ -1744,6 +1787,7 @@ def handle_release_stage( output=args.output, input=args.input, ) + elif args.command == "build": args.func(librarian=args.librarian, repo=args.repo) elif args.command == "release-stage": diff --git a/.librarian/generate-request.json b/.librarian/generate-request.json new file mode 100644 index 000000000000..205c69a29519 --- /dev/null +++ b/.librarian/generate-request.json @@ -0,0 +1,32 @@ +{ + "id": "google-cloud-discoveryengine", + "version": "0.4.0", + "apis": [ + { + "path": "google/cloud/discoveryengine/v1", + "service_config": "discoveryengine_v1.yaml" + }, + { + "path": "google/cloud/discoveryengine/v1beta", + "service_config": "discoveryengine_v1beta.yaml" + }, + { + "path": "google/cloud/discoveryengine/v1alpha", + "service_config": "discoveryengine_v1alpha.yaml" + } + ], + "source_roots": [ + "packages/google-cloud-discoveryengine" + ], + "preserve_regex": [ + "packages/google-cloud-discoveryengine/CHANGELOG.md", + "docs/CHANGELOG.md", + "samples/README.txt", + "samples/snippets/README.rst", + "tests/system" + ], + "remove_regex": [ + "packages/google-cloud-discoveryengine/" + ], + "tag_format": "{id}-v{version}" +} \ No newline at end of file diff --git a/.librarian/state.yaml b/.librarian/state.yaml index 1bcd77bfc4f5..5d104eb474c7 100644 --- a/.librarian/state.yaml +++ b/.librarian/state.yaml @@ -1,4306 +1,23 @@ -image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:72e9b62c0f8f3799651ee62d777a2905f5b72ff19ea46f2e7b7d682d7d1e9414 +image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator:latest libraries: - - id: google-ads-admanager - version: 0.6.0 - last_generated_commit: e8365a7f88fabe8717cb8322b8ce784b03b6daea - apis: - - path: google/ads/admanager/v1 - service_config: admanager_v1.yaml - source_roots: - - packages/google-ads-admanager - preserve_regex: - - packages/google-ads-admanager/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-ads-admanager/ - tag_format: '{id}-v{version}' - - id: google-ads-datamanager - version: 0.1.0 - last_generated_commit: c2db528a3e4d12b95666c719ee0db30a3d4c78ad - apis: - - path: google/ads/datamanager/v1 - service_config: datamanager_v1.yaml - source_roots: - - packages/google-ads-datamanager - preserve_regex: - - packages/google-ads-datamanager/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-ads-datamanager - tag_format: '{id}-v{version}' - - id: google-ads-marketingplatform-admin - version: 0.3.0 - last_generated_commit: 53f97391f3451398f7b53c7f86dabd325d205677 - apis: - - path: google/marketingplatform/admin/v1alpha - service_config: marketingplatformadmin_v1alpha.yaml - source_roots: - - packages/google-ads-marketingplatform-admin - preserve_regex: - - packages/google-ads-marketingplatform-admin/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-ads-marketingplatform-admin/ - tag_format: '{id}-v{version}' - - id: google-ai-generativelanguage - version: 0.9.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/ai/generativelanguage/v1 - service_config: generativelanguage_v1.yaml - - path: google/ai/generativelanguage/v1beta - service_config: generativelanguage_v1beta.yaml - - path: google/ai/generativelanguage/v1beta3 - service_config: generativelanguage_v1beta3.yaml - - path: google/ai/generativelanguage/v1beta2 - service_config: generativelanguage_v1beta2.yaml - - path: google/ai/generativelanguage/v1alpha - service_config: generativelanguage_v1alpha.yaml - source_roots: - - packages/google-ai-generativelanguage - preserve_regex: - - packages/google-ai-generativelanguage/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-ai-generativelanguage/ - tag_format: '{id}-v{version}' - - id: google-analytics-admin - version: 0.26.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/analytics/admin/v1beta - service_config: analyticsadmin_v1beta.yaml - - path: google/analytics/admin/v1alpha - service_config: analyticsadmin_v1alpha.yaml - source_roots: - - packages/google-analytics-admin - preserve_regex: - - packages/google-analytics-admin/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-analytics-admin/ - tag_format: '{id}-v{version}' - - id: google-analytics-data - version: 0.19.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/analytics/data/v1alpha - service_config: analyticsdata_v1alpha.yaml - - path: google/analytics/data/v1beta - service_config: analyticsdata_v1beta.yaml - source_roots: - - packages/google-analytics-data - preserve_regex: - - packages/google-analytics-data/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-analytics-data/ - tag_format: '{id}-v{version}' - - id: google-apps-card - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/apps/card/v1 - service_config: "" - source_roots: - - packages/google-apps-card - preserve_regex: - - packages/google-apps-card/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/gapic/card_v1/test_card.py - remove_regex: - - packages/google-apps-card/ - tag_format: '{id}-v{version}' - - id: google-apps-chat - version: 0.4.0 - last_generated_commit: e8365a7f88fabe8717cb8322b8ce784b03b6daea - apis: - - path: google/chat/v1 - service_config: chat_v1.yaml - source_roots: - - packages/google-apps-chat - preserve_regex: - - packages/google-apps-chat/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-apps-chat/ - tag_format: '{id}-v{version}' - - id: google-apps-events-subscriptions - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/apps/events/subscriptions/v1 - service_config: workspaceevents_v1.yaml - - path: google/apps/events/subscriptions/v1beta - service_config: workspaceevents_v1beta.yaml - source_roots: - - packages/google-apps-events-subscriptions - preserve_regex: - - packages/google-apps-events-subscriptions/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-apps-events-subscriptions/ - tag_format: '{id}-v{version}' - - id: google-apps-meet - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/apps/meet/v2beta - service_config: meet_v2beta.yaml - - path: google/apps/meet/v2 - service_config: meet_v2.yaml - source_roots: - - packages/google-apps-meet - preserve_regex: - - packages/google-apps-meet/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-apps-meet/ - tag_format: '{id}-v{version}' - - id: google-apps-script-type - version: 0.4.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/apps/script/type - service_config: "" - - path: google/apps/script/type/gmail - service_config: "" - - path: google/apps/script/type/docs - service_config: "" - - path: google/apps/script/type/drive - service_config: "" - - path: google/apps/script/type/sheets - service_config: "" - - path: google/apps/script/type/calendar - service_config: "" - - path: google/apps/script/type/slides - service_config: "" - source_roots: - - packages/google-apps-script-type - preserve_regex: - - packages/google-apps-script-type/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/gapic/calendar/test_calendar.py - - tests/unit/gapic/docs/test_docs.py - - tests/unit/gapic/drive/test_drive.py - - tests/unit/gapic/gmail/test_gmail.py - - tests/unit/gapic/sheets/test_sheets.py - - tests/unit/gapic/slides/test_slides.py - - tests/unit/gapic/type/test_type.py - remove_regex: - - packages/google-apps-script-type - tag_format: '{id}-v{version}' - - id: google-area120-tables - version: 0.12.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/area120/tables/v1alpha1 - service_config: area120tables_v1alpha1.yaml - source_roots: - - packages/google-area120-tables - preserve_regex: - - packages/google-area120-tables/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-area120-tables/ - tag_format: '{id}-v{version}' - - id: google-cloud-access-approval - version: 1.17.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/accessapproval/v1 - service_config: accessapproval_v1.yaml - source_roots: - - packages/google-cloud-access-approval - preserve_regex: - - packages/google-cloud-access-approval/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-access-approval/ - tag_format: '{id}-v{version}' - - id: google-cloud-access-context-manager - version: 0.3.0 - last_generated_commit: e8365a7f88fabe8717cb8322b8ce784b03b6daea - apis: - - path: google/identity/accesscontextmanager/v1 - service_config: accesscontextmanager_v1.yaml - - path: google/identity/accesscontextmanager/type - service_config: "" - source_roots: - - packages/google-cloud-access-context-manager - preserve_regex: [] - remove_regex: - - ^packages/google-cloud-access-context-manager/google/.*/.*(?:\.proto|_pb2\.(?:py|pyi))$ - - .repo-metadata.json - - README.rst - - docs/summary_overview.md - tag_format: '{id}-v{version}' - - id: google-cloud-advisorynotifications - version: 0.4.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/advisorynotifications/v1 - service_config: advisorynotifications_v1.yaml - source_roots: - - packages/google-cloud-advisorynotifications - preserve_regex: - - packages/google-cloud-advisorynotifications/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-advisorynotifications/ - tag_format: '{id}-v{version}' - - id: google-cloud-alloydb - version: 0.6.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/alloydb/v1beta - service_config: alloydb_v1beta.yaml - - path: google/cloud/alloydb/v1 - service_config: alloydb_v1.yaml - - path: google/cloud/alloydb/v1alpha - service_config: alloydb_v1alpha.yaml - source_roots: - - packages/google-cloud-alloydb - preserve_regex: - - packages/google-cloud-alloydb/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-alloydb/ - tag_format: '{id}-v{version}' - - id: google-cloud-alloydb-connectors - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/alloydb/connectors/v1 - service_config: connectors_v1.yaml - - path: google/cloud/alloydb/connectors/v1alpha - service_config: connectors_v1alpha.yaml - - path: google/cloud/alloydb/connectors/v1beta - service_config: connectors_v1beta.yaml - source_roots: - - packages/google-cloud-alloydb-connectors - preserve_regex: - - packages/google-cloud-alloydb-connectors/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/gapic/connectors_v1/test_connectors.py - remove_regex: - - packages/google-cloud-alloydb-connectors/ - tag_format: '{id}-v{version}' - - id: google-cloud-api-gateway - version: 1.13.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/apigateway/v1 - service_config: apigateway_v1.yaml - source_roots: - - packages/google-cloud-api-gateway - preserve_regex: - - packages/google-cloud-api-gateway/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-api-gateway/ - tag_format: '{id}-v{version}' - - id: google-cloud-api-keys - version: 0.6.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/api/apikeys/v2 - service_config: apikeys_v2.yaml - source_roots: - - packages/google-cloud-api-keys - preserve_regex: - - packages/google-cloud-api-keys/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-api-keys/ - tag_format: '{id}-v{version}' - - id: google-cloud-apigee-connect - version: 1.13.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/apigeeconnect/v1 - service_config: apigeeconnect_v1.yaml - source_roots: - - packages/google-cloud-apigee-connect - preserve_regex: - - packages/google-cloud-apigee-connect/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-apigee-connect/ - tag_format: '{id}-v{version}' - - id: google-cloud-apigee-registry - version: 0.7.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/apigeeregistry/v1 - service_config: apigeeregistry_v1.yaml - source_roots: - - packages/google-cloud-apigee-registry - preserve_regex: - - packages/google-cloud-apigee-registry/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-apigee-registry/ - tag_format: '{id}-v{version}' - - id: google-cloud-apihub - version: 0.4.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/apihub/v1 - service_config: apihub_v1.yaml - source_roots: - - packages/google-cloud-apihub - preserve_regex: - - packages/google-cloud-apihub/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-apihub/ - tag_format: '{id}-v{version}' - - id: google-cloud-appengine-admin - version: 1.15.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/appengine/v1 - service_config: appengine_v1.yaml - source_roots: - - packages/google-cloud-appengine-admin - preserve_regex: - - packages/google-cloud-appengine-admin/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-appengine-admin/ - tag_format: '{id}-v{version}' - - id: google-cloud-appengine-logging - version: 1.7.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/appengine/logging/v1 - service_config: "" - source_roots: - - packages/google-cloud-appengine-logging - preserve_regex: - - packages/google-cloud-appengine-logging/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/gapic/appengine_logging_v1/test_appengine_logging_v1.py - remove_regex: - - packages/google-cloud-appengine-logging/ - tag_format: '{id}-v{version}' - - id: google-cloud-apphub - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/apphub/v1 - service_config: apphub_v1.yaml - source_roots: - - packages/google-cloud-apphub - preserve_regex: - - packages/google-cloud-apphub/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-apphub/ - tag_format: '{id}-v{version}' - - id: google-cloud-artifact-registry - version: 1.17.0 - last_generated_commit: c2db528a3e4d12b95666c719ee0db30a3d4c78ad - apis: - - path: google/devtools/artifactregistry/v1 - service_config: artifactregistry_v1.yaml - - path: google/devtools/artifactregistry/v1beta2 - service_config: artifactregistry_v1beta2.yaml - source_roots: - - packages/google-cloud-artifact-registry - preserve_regex: - - packages/google-cloud-artifact-registry/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-artifact-registry/ - tag_format: '{id}-v{version}' - - id: google-cloud-asset - version: 4.1.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/asset/v1p5beta1 - service_config: cloudasset_v1p5beta1.yaml - - path: google/cloud/asset/v1 - service_config: cloudasset_v1.yaml - - path: google/cloud/asset/v1p1beta1 - service_config: cloudasset_v1p1beta1.yaml - - path: google/cloud/asset/v1p2beta1 - service_config: cloudasset_v1p2beta1.yaml - source_roots: - - packages/google-cloud-asset - preserve_regex: - - packages/google-cloud-asset/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-asset/ - tag_format: '{id}-v{version}' - - id: google-cloud-assured-workloads - version: 2.1.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/assuredworkloads/v1 - service_config: assuredworkloads_v1.yaml - - path: google/cloud/assuredworkloads/v1beta1 - service_config: assuredworkloads_v1beta1.yaml - source_roots: - - packages/google-cloud-assured-workloads - preserve_regex: - - packages/google-cloud-assured-workloads/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-assured-workloads/ - tag_format: '{id}-v{version}' - - id: google-cloud-audit-log - version: 0.4.0 - last_generated_commit: e8365a7f88fabe8717cb8322b8ce784b03b6daea - apis: - - path: google/cloud/audit - service_config: cloudaudit.yaml - source_roots: - - packages/google-cloud-audit-log - preserve_regex: [] - remove_regex: - - ^packages/google-cloud-audit-log/google/.*/.*(?:\.proto|_pb2\.(?:py|pyi))$ - - .repo-metadata.json - - README.rst - - docs/summary_overview.md - tag_format: '{id}-v{version}' - - id: google-cloud-automl - version: 2.17.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/automl/v1beta1 - service_config: automl_v1beta1.yaml - - path: google/cloud/automl/v1 - service_config: automl_v1.yaml - source_roots: - - packages/google-cloud-automl - preserve_regex: - - packages/google-cloud-automl/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - docs/automl_v1beta1/tables.rst - - google/cloud/automl_v1beta1/services/tables - - samples/README - - tests/unit/test_gcs_client_v1beta1.py - - tests/unit/test_tables_client_v1beta1.py - remove_regex: - - packages/google-cloud-automl/ - tag_format: '{id}-v{version}' - - id: google-cloud-backupdr - version: 0.4.0 - last_generated_commit: a17b84add8318f780fcc8a027815d5fee644b9f7 - apis: - - path: google/cloud/backupdr/v1 - service_config: backupdr_v1.yaml - source_roots: - - packages/google-cloud-backupdr - preserve_regex: - - packages/google-cloud-backupdr/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-backupdr/ - tag_format: '{id}-v{version}' - - id: google-cloud-bare-metal-solution - version: 1.11.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/baremetalsolution/v2 - service_config: baremetalsolution_v2.yaml - source_roots: - - packages/google-cloud-bare-metal-solution - preserve_regex: - - packages/google-cloud-bare-metal-solution/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-bare-metal-solution/ - tag_format: '{id}-v{version}' - - id: google-cloud-batch - version: 0.18.0 - last_generated_commit: a17b84add8318f780fcc8a027815d5fee644b9f7 - apis: - - path: google/cloud/batch/v1alpha - service_config: batch_v1alpha.yaml - - path: google/cloud/batch/v1 - service_config: batch_v1.yaml - source_roots: - - packages/google-cloud-batch - preserve_regex: - - packages/google-cloud-batch/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-batch/ - tag_format: '{id}-v{version}' - - id: google-cloud-beyondcorp-appconnections - version: 0.5.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/beyondcorp/appconnections/v1 - service_config: beyondcorp_v1.yaml - source_roots: - - packages/google-cloud-beyondcorp-appconnections - preserve_regex: - - packages/google-cloud-beyondcorp-appconnections/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-beyondcorp-appconnections/ - tag_format: '{id}-v{version}' - - id: google-cloud-beyondcorp-appconnectors - version: 0.5.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/beyondcorp/appconnectors/v1 - service_config: beyondcorp_v1.yaml - source_roots: - - packages/google-cloud-beyondcorp-appconnectors - preserve_regex: - - packages/google-cloud-beyondcorp-appconnectors/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-beyondcorp-appconnectors/ - tag_format: '{id}-v{version}' - - id: google-cloud-beyondcorp-appgateways - version: 0.5.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/beyondcorp/appgateways/v1 - service_config: beyondcorp_v1.yaml - source_roots: - - packages/google-cloud-beyondcorp-appgateways - preserve_regex: - - packages/google-cloud-beyondcorp-appgateways/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-beyondcorp-appgateways/ - tag_format: '{id}-v{version}' - - id: google-cloud-beyondcorp-clientconnectorservices - version: 0.5.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/beyondcorp/clientconnectorservices/v1 - service_config: beyondcorp_v1.yaml - source_roots: - - packages/google-cloud-beyondcorp-clientconnectorservices - preserve_regex: - - packages/google-cloud-beyondcorp-clientconnectorservices/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-beyondcorp-clientconnectorservices/ - tag_format: '{id}-v{version}' - - id: google-cloud-beyondcorp-clientgateways - version: 0.5.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/beyondcorp/clientgateways/v1 - service_config: beyondcorp_v1.yaml - source_roots: - - packages/google-cloud-beyondcorp-clientgateways - preserve_regex: - - packages/google-cloud-beyondcorp-clientgateways/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-beyondcorp-clientgateways/ - tag_format: '{id}-v{version}' - - id: google-cloud-biglake - version: 0.1.1 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/biglake/v1 - service_config: biglake_v1.yaml - source_roots: - - packages/google-cloud-biglake - preserve_regex: - - packages/google-cloud-biglake/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-biglake - tag_format: '{id}-v{version}' - - id: google-cloud-bigquery-analyticshub - version: 0.6.0 - last_generated_commit: 53f97391f3451398f7b53c7f86dabd325d205677 - apis: - - path: google/cloud/bigquery/analyticshub/v1 - service_config: analyticshub_v1.yaml - source_roots: - - packages/google-cloud-bigquery-analyticshub - preserve_regex: - - packages/google-cloud-bigquery-analyticshub/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-bigquery-analyticshub/ - tag_format: '{id}-v{version}' - - id: google-cloud-bigquery-biglake - version: 0.5.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/bigquery/biglake/v1alpha1 - service_config: biglake_v1alpha1.yaml - - path: google/cloud/bigquery/biglake/v1 - service_config: biglake_v1.yaml - source_roots: - - packages/google-cloud-bigquery-biglake - preserve_regex: - - packages/google-cloud-bigquery-biglake/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-bigquery-biglake/ - tag_format: '{id}-v{version}' - - id: google-cloud-bigquery-connection - version: 1.19.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/bigquery/connection/v1 - service_config: bigqueryconnection_v1.yaml - source_roots: - - packages/google-cloud-bigquery-connection - preserve_regex: - - packages/google-cloud-bigquery-connection/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-bigquery-connection/ - tag_format: '{id}-v{version}' - - id: google-cloud-bigquery-data-exchange - version: 0.6.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/bigquery/dataexchange/v1beta1 - service_config: analyticshub_v1beta1.yaml - source_roots: - - packages/google-cloud-bigquery-data-exchange - preserve_regex: - - packages/google-cloud-bigquery-data-exchange/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-bigquery-data-exchange/ - tag_format: '{id}-v{version}' - - id: google-cloud-bigquery-datapolicies - version: 0.7.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/bigquery/datapolicies/v2beta1 - service_config: bigquerydatapolicy_v2beta1.yaml - - path: google/cloud/bigquery/datapolicies/v2 - service_config: bigquerydatapolicy_v2.yaml - - path: google/cloud/bigquery/datapolicies/v1beta1 - service_config: bigquerydatapolicy_v1beta1.yaml - - path: google/cloud/bigquery/datapolicies/v1 - service_config: bigquerydatapolicy_v1.yaml - source_roots: - - packages/google-cloud-bigquery-datapolicies - preserve_regex: - - packages/google-cloud-bigquery-datapolicies/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-bigquery-datapolicies/ - tag_format: '{id}-v{version}' - - id: google-cloud-bigquery-datatransfer - version: 3.20.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/bigquery/datatransfer/v1 - service_config: bigquerydatatransfer_v1.yaml - source_roots: - - packages/google-cloud-bigquery-datatransfer - preserve_regex: - - packages/google-cloud-bigquery-datatransfer/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-bigquery-datatransfer/ - tag_format: '{id}-v{version}' - - id: google-cloud-bigquery-logging - version: 1.7.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/bigquery/logging/v1 - service_config: "" - source_roots: - - packages/google-cloud-bigquery-logging - preserve_regex: - - packages/google-cloud-bigquery-logging/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/gapic/bigquery_logging_v1/test_bigquery_logging_v1.py - remove_regex: - - packages/google-cloud-bigquery-logging/ - tag_format: '{id}-v{version}' - - id: google-cloud-bigquery-migration - version: 0.12.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/bigquery/migration/v2alpha - service_config: bigquerymigration_v2alpha.yaml - - path: google/cloud/bigquery/migration/v2 - service_config: bigquerymigration_v2.yaml - source_roots: - - packages/google-cloud-bigquery-migration - preserve_regex: - - packages/google-cloud-bigquery-migration/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-bigquery-migration/ - tag_format: '{id}-v{version}' - - id: google-cloud-bigquery-reservation - version: 1.21.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/bigquery/reservation/v1 - service_config: bigqueryreservation_v1.yaml - source_roots: - - packages/google-cloud-bigquery-reservation - preserve_regex: - - packages/google-cloud-bigquery-reservation/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-bigquery-reservation/ - tag_format: '{id}-v{version}' - - id: google-cloud-bigquery-storage - version: 2.34.0 - last_generated_commit: bd94e0b8c4975af0a66dc1f846c63c77dbc0064e - apis: - - path: google/cloud/bigquery/storage/v1beta2 - service_config: bigquerystorage_v1beta2.yaml - - path: google/cloud/bigquery/storage/v1alpha - service_config: bigquerystorage_v1alpha.yaml - - path: google/cloud/bigquery/storage/v1beta - service_config: bigquerystorage_v1beta.yaml - - path: google/cloud/bigquery/storage/v1 - service_config: bigquerystorage_v1.yaml - source_roots: - - packages/google-cloud-bigquery-storage - preserve_regex: - - docs/.*/library.rst - - docs/samples - - docs/CHANGELOG.md - - google/cloud/bigquery_storage_v1/client.py - - google/cloud/bigquery_storage_v1/exceptions.py - - google/cloud/bigquery_storage_v1/gapic_types.py - - google/cloud/bigquery_storage_v1/reader.py - - google/cloud/bigquery_storage_v1/writer.py - - google/cloud/bigquery_storage_v1beta2/client.py - - google/cloud/bigquery_storage_v1beta2/exceptions.py - - google/cloud/bigquery_storage_v1beta2/writer.py - - packages/google-cloud-bigquery-storage/CHANGELOG.md - - packages/google-cloud-bigquery-storage/CONTRIBUTING - - samples/__init__.py - - samples/README.txt - - samples/conftest.py - - samples/pyarrow - - samples/quickstart - - samples/snippets - - samples/to_dataframe - - scripts/readme-gen - - testing/.gitignore - - tests/system - - tests/unit/helpers.py - - tests/unit/test_.*.py - remove_regex: - - packages/google-cloud-bigquery-storage - tag_format: '{id}-v{version}' - - id: google-cloud-billing - version: 1.17.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/billing/v1 - service_config: cloudbilling_v1.yaml - source_roots: - - packages/google-cloud-billing - preserve_regex: - - packages/google-cloud-billing/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-billing/ - tag_format: '{id}-v{version}' - - id: google-cloud-billing-budgets - version: 1.18.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/billing/budgets/v1 - service_config: billingbudgets.yaml - - path: google/cloud/billing/budgets/v1beta1 - service_config: billingbudgets.yaml - source_roots: - - packages/google-cloud-billing-budgets - preserve_regex: - - packages/google-cloud-billing-budgets/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-billing-budgets/ - tag_format: '{id}-v{version}' - - id: google-cloud-binary-authorization - version: 1.14.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/binaryauthorization/v1 - service_config: binaryauthorization_v1.yaml - - path: google/cloud/binaryauthorization/v1beta1 - service_config: binaryauthorization_v1beta1.yaml - source_roots: - - packages/google-cloud-binary-authorization - preserve_regex: - - packages/google-cloud-binary-authorization/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-binary-authorization/ - tag_format: '{id}-v{version}' - - id: google-cloud-build - version: 3.33.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/devtools/cloudbuild/v1 - service_config: cloudbuild_v1.yaml - - path: google/devtools/cloudbuild/v2 - service_config: cloudbuild_v2.yaml - source_roots: - - packages/google-cloud-build - preserve_regex: - - packages/google-cloud-build/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-build/ - tag_format: '{id}-v{version}' - - id: google-cloud-capacityplanner - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/capacityplanner/v1beta - service_config: capacityplanner_v1beta.yaml - source_roots: - - packages/google-cloud-capacityplanner - preserve_regex: - - packages/google-cloud-capacityplanner/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-capacityplanner/ - tag_format: '{id}-v{version}' - - id: google-cloud-certificate-manager - version: 1.11.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/certificatemanager/v1 - service_config: certificatemanager_v1.yaml - source_roots: - - packages/google-cloud-certificate-manager - preserve_regex: - - packages/google-cloud-certificate-manager/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-certificate-manager/ - tag_format: '{id}-v{version}' - - id: google-cloud-channel - version: 1.24.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/channel/v1 - service_config: cloudchannel_v1.yaml - source_roots: - - packages/google-cloud-channel - preserve_regex: - - packages/google-cloud-channel/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-channel/ - tag_format: '{id}-v{version}' - - id: google-cloud-chronicle - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/chronicle/v1 - service_config: chronicle_v1.yaml - source_roots: - - packages/google-cloud-chronicle - preserve_regex: - - packages/google-cloud-chronicle/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-chronicle/ - tag_format: '{id}-v{version}' - - id: google-cloud-cloudcontrolspartner - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/cloudcontrolspartner/v1beta - service_config: cloudcontrolspartner_v1beta.yaml - - path: google/cloud/cloudcontrolspartner/v1 - service_config: cloudcontrolspartner_v1.yaml - source_roots: - - packages/google-cloud-cloudcontrolspartner - preserve_regex: - - packages/google-cloud-cloudcontrolspartner/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-cloudcontrolspartner/ - tag_format: '{id}-v{version}' - - id: google-cloud-cloudsecuritycompliance - version: 0.4.0 - last_generated_commit: 53f97391f3451398f7b53c7f86dabd325d205677 - apis: - - path: google/cloud/cloudsecuritycompliance/v1 - service_config: cloudsecuritycompliance_v1.yaml - source_roots: - - packages/google-cloud-cloudsecuritycompliance - preserve_regex: - - packages/google-cloud-cloudsecuritycompliance/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-cloudsecuritycompliance/ - tag_format: '{id}-v{version}' - - id: google-cloud-commerce-consumer-procurement - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/commerce/consumer/procurement/v1 - service_config: cloudcommerceconsumerprocurement_v1.yaml - - path: google/cloud/commerce/consumer/procurement/v1alpha1 - service_config: cloudcommerceconsumerprocurement_v1alpha1.yaml - source_roots: - - packages/google-cloud-commerce-consumer-procurement - preserve_regex: - - packages/google-cloud-commerce-consumer-procurement/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-commerce-consumer-procurement/ - tag_format: '{id}-v{version}' - - id: google-cloud-common - version: 1.7.0 - last_generated_commit: e8365a7f88fabe8717cb8322b8ce784b03b6daea - apis: - - path: google/cloud/common - service_config: common.yaml - source_roots: - - packages/google-cloud-common - preserve_regex: - - packages/google-cloud-common/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/gapic/common/test_common.py - remove_regex: - - packages/google-cloud-common/ - tag_format: '{id}-v{version}' - - id: google-cloud-compute - version: 1.40.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/compute/v1 - service_config: compute_v1.yaml - source_roots: - - packages/google-cloud-compute - preserve_regex: - - packages/google-cloud-compute/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-compute/ - tag_format: '{id}-v{version}' - - id: google-cloud-compute-v1beta - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/compute/v1beta - service_config: compute_v1beta.yaml - source_roots: - - packages/google-cloud-compute-v1beta - preserve_regex: - - packages/google-cloud-compute-v1beta/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-compute-v1beta/ - tag_format: '{id}-v{version}' - - id: google-cloud-confidentialcomputing - version: 0.6.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/confidentialcomputing/v1 - service_config: confidentialcomputing_v1.yaml - source_roots: - - packages/google-cloud-confidentialcomputing - preserve_regex: - - packages/google-cloud-confidentialcomputing/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-confidentialcomputing/ - tag_format: '{id}-v{version}' - - id: google-cloud-config - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/config/v1 - service_config: config_v1.yaml - source_roots: - - packages/google-cloud-config - preserve_regex: - - packages/google-cloud-config/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-config/ - tag_format: '{id}-v{version}' - - id: google-cloud-configdelivery - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/configdelivery/v1beta - service_config: configdelivery_v1beta.yaml - - path: google/cloud/configdelivery/v1alpha - service_config: configdelivery_v1alpha.yaml - - path: google/cloud/configdelivery/v1 - service_config: configdelivery_v1.yaml - source_roots: - - packages/google-cloud-configdelivery - preserve_regex: - - packages/google-cloud-configdelivery/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-configdelivery/ - tag_format: '{id}-v{version}' - - id: google-cloud-contact-center-insights - version: 1.24.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/contactcenterinsights/v1 - service_config: contactcenterinsights_v1.yaml - source_roots: - - packages/google-cloud-contact-center-insights - preserve_regex: - - packages/google-cloud-contact-center-insights/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-contact-center-insights/ - tag_format: '{id}-v{version}' - - id: google-cloud-container - version: 2.61.0 - last_generated_commit: 94ccdfe4519e0ba817bd33aa22eb9c64f88a6874 - apis: - - path: google/container/v1 - service_config: container_v1.yaml - - path: google/container/v1beta1 - service_config: container_v1beta1.yaml - source_roots: - - packages/google-cloud-container - preserve_regex: - - packages/google-cloud-container/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-container/ - tag_format: '{id}-v{version}' - - id: google-cloud-containeranalysis - version: 2.19.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/devtools/containeranalysis/v1 - service_config: containeranalysis_v1.yaml - source_roots: - - packages/google-cloud-containeranalysis - preserve_regex: - - packages/google-cloud-containeranalysis/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/test_get_grafeas_client.py - remove_regex: - - packages/google-cloud-containeranalysis/ - tag_format: '{id}-v{version}' - - id: google-cloud-contentwarehouse - version: 0.8.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/contentwarehouse/v1 - service_config: contentwarehouse_v1.yaml - source_roots: - - packages/google-cloud-contentwarehouse - preserve_regex: - - packages/google-cloud-contentwarehouse/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-contentwarehouse/ - tag_format: '{id}-v{version}' - - id: google-cloud-data-fusion - version: 1.14.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/datafusion/v1 - service_config: datafusion_v1.yaml - source_roots: - - packages/google-cloud-data-fusion - preserve_regex: - - packages/google-cloud-data-fusion/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-data-fusion/ - tag_format: '{id}-v{version}' - - id: google-cloud-data-qna - version: 0.11.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/dataqna/v1alpha - service_config: dataqna_v1alpha.yaml - source_roots: - - packages/google-cloud-data-qna - preserve_regex: - - packages/google-cloud-data-qna/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-data-qna/ - tag_format: '{id}-v{version}' - - id: google-cloud-datacatalog - version: 3.28.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/datacatalog/v1 - service_config: datacatalog_v1.yaml - - path: google/cloud/datacatalog/v1beta1 - service_config: datacatalog_v1beta1.yaml - source_roots: - - packages/google-cloud-datacatalog - preserve_regex: - - packages/google-cloud-datacatalog/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-datacatalog/ - tag_format: '{id}-v{version}' - - id: google-cloud-datacatalog-lineage - version: 0.4.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/datacatalog/lineage/v1 - service_config: datalineage_v1.yaml - source_roots: - - packages/google-cloud-datacatalog-lineage - preserve_regex: - - packages/google-cloud-datacatalog-lineage/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-datacatalog-lineage/ - tag_format: '{id}-v{version}' - - id: google-cloud-dataflow-client - version: 0.10.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/dataflow/v1beta3 - service_config: dataflow_v1beta3.yaml - source_roots: - - packages/google-cloud-dataflow-client - preserve_regex: - - packages/google-cloud-dataflow-client/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-dataflow-client/ - tag_format: '{id}-v{version}' - - id: google-cloud-dataform - version: 0.7.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/dataform/v1beta1 - service_config: dataform_v1beta1.yaml - - path: google/cloud/dataform/v1 - service_config: dataform_v1.yaml - source_roots: - - packages/google-cloud-dataform - preserve_regex: - - packages/google-cloud-dataform/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-dataform/ - tag_format: '{id}-v{version}' - - id: google-cloud-datalabeling - version: 1.14.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/datalabeling/v1beta1 - service_config: datalabeling_v1beta1.yaml - source_roots: - - packages/google-cloud-datalabeling - preserve_regex: - - packages/google-cloud-datalabeling/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-datalabeling/ - tag_format: '{id}-v{version}' - - id: google-cloud-dataplex - version: 2.15.0 - last_generated_commit: 53f97391f3451398f7b53c7f86dabd325d205677 - apis: - - path: google/cloud/dataplex/v1 - service_config: dataplex_v1.yaml - source_roots: - - packages/google-cloud-dataplex - preserve_regex: - - packages/google-cloud-dataplex/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-dataplex/ - tag_format: '{id}-v{version}' - - id: google-cloud-dataproc - version: 5.23.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/dataproc/v1 - service_config: dataproc_v1.yaml - source_roots: - - packages/google-cloud-dataproc - preserve_regex: - - packages/google-cloud-dataproc/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-dataproc/ - tag_format: '{id}-v{version}' - - id: google-cloud-dataproc-metastore - version: 1.20.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/metastore/v1alpha - service_config: metastore_v1alpha.yaml - - path: google/cloud/metastore/v1beta - service_config: metastore_v1beta.yaml - - path: google/cloud/metastore/v1 - service_config: metastore_v1.yaml - source_roots: - - packages/google-cloud-dataproc-metastore - preserve_regex: - - packages/google-cloud-dataproc-metastore/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-dataproc-metastore/ - tag_format: '{id}-v{version}' - - id: google-cloud-datastream - version: 1.16.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/datastream/v1 - service_config: datastream_v1.yaml - - path: google/cloud/datastream/v1alpha1 - service_config: datastream_v1alpha1.yaml - source_roots: - - packages/google-cloud-datastream - preserve_regex: - - packages/google-cloud-datastream/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-datastream/ - tag_format: '{id}-v{version}' - - id: google-cloud-deploy - version: 2.8.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/deploy/v1 - service_config: clouddeploy_v1.yaml - source_roots: - - packages/google-cloud-deploy - preserve_regex: - - packages/google-cloud-deploy/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-deploy/ - tag_format: '{id}-v{version}' - - id: google-cloud-developerconnect - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/developerconnect/v1 - service_config: developerconnect_v1.yaml - source_roots: - - packages/google-cloud-developerconnect - preserve_regex: - - packages/google-cloud-developerconnect/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-developerconnect/ - tag_format: '{id}-v{version}' - - id: google-cloud-devicestreaming - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/devicestreaming/v1 - service_config: devicestreaming_v1.yaml - source_roots: - - packages/google-cloud-devicestreaming - preserve_regex: - - packages/google-cloud-devicestreaming/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-devicestreaming/ - tag_format: '{id}-v{version}' - - id: google-cloud-dialogflow - version: 2.43.0 - last_generated_commit: c2db528a3e4d12b95666c719ee0db30a3d4c78ad - apis: - - path: google/cloud/dialogflow/v2beta1 - service_config: dialogflow_v2beta1.yaml - - path: google/cloud/dialogflow/v2 - service_config: dialogflow_v2.yaml - source_roots: - - packages/google-cloud-dialogflow - preserve_regex: - - packages/google-cloud-dialogflow/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-dialogflow/ - tag_format: '{id}-v{version}' - - id: google-cloud-dialogflow-cx - version: 2.0.0 - last_generated_commit: c2db528a3e4d12b95666c719ee0db30a3d4c78ad - apis: - - path: google/cloud/dialogflow/cx/v3 - service_config: dialogflow_v3.yaml - - path: google/cloud/dialogflow/cx/v3beta1 - service_config: dialogflow_v3beta1.yaml - source_roots: - - packages/google-cloud-dialogflow-cx - preserve_regex: - - packages/google-cloud-dialogflow-cx/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-dialogflow-cx - tag_format: '{id}-v{version}' - - id: google-cloud-discoveryengine - version: 0.15.0 - last_generated_commit: c288189b43c016dd3cf1ec73ce3cadee8b732f07 - apis: - - path: google/cloud/discoveryengine/v1 - service_config: discoveryengine_v1.yaml - - path: google/cloud/discoveryengine/v1beta - service_config: discoveryengine_v1beta.yaml - - path: google/cloud/discoveryengine/v1alpha - service_config: discoveryengine_v1alpha.yaml - source_roots: - - packages/google-cloud-discoveryengine - preserve_regex: - - packages/google-cloud-discoveryengine/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-discoveryengine/ - tag_format: '{id}-v{version}' - - id: google-cloud-dlp - version: 3.33.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/privacy/dlp/v2 - service_config: dlp_v2.yaml - source_roots: - - packages/google-cloud-dlp - preserve_regex: - - packages/google-cloud-dlp/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-dlp/ - tag_format: '{id}-v{version}' - - id: google-cloud-dms - version: 1.13.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/clouddms/v1 - service_config: datamigration_v1.yaml - source_roots: - - packages/google-cloud-dms - preserve_regex: - - packages/google-cloud-dms/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-dms/ - tag_format: '{id}-v{version}' - - id: google-cloud-documentai - version: 3.7.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/documentai/v1beta3 - service_config: documentai_v1beta3.yaml - - path: google/cloud/documentai/v1 - service_config: documentai_v1.yaml - source_roots: - - packages/google-cloud-documentai - preserve_regex: - - packages/google-cloud-documentai/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-documentai/ - tag_format: '{id}-v{version}' - - id: google-cloud-domains - version: 1.11.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/domains/v1beta1 - service_config: domains_v1beta1.yaml - - path: google/cloud/domains/v1 - service_config: domains_v1.yaml - source_roots: - - packages/google-cloud-domains - preserve_regex: - - packages/google-cloud-domains/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-domains/ - tag_format: '{id}-v{version}' - - id: google-cloud-edgecontainer - version: 0.6.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/edgecontainer/v1 - service_config: edgecontainer_v1.yaml - source_roots: - - packages/google-cloud-edgecontainer - preserve_regex: - - packages/google-cloud-edgecontainer/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-edgecontainer/ - tag_format: '{id}-v{version}' - - id: google-cloud-edgenetwork - version: 0.3.0 - last_generated_commit: b1a9eefc2e1021fb9465bdac5e2984499451ae34 - apis: - - path: google/cloud/edgenetwork/v1 - service_config: edgenetwork_v1.yaml - source_roots: - - packages/google-cloud-edgenetwork - preserve_regex: - - packages/google-cloud-edgenetwork/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-edgenetwork/ - tag_format: '{id}-v{version}' - - id: google-cloud-enterpriseknowledgegraph - version: 0.4.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/enterpriseknowledgegraph/v1 - service_config: enterpriseknowledgegraph_v1.yaml - source_roots: - - packages/google-cloud-enterpriseknowledgegraph - preserve_regex: - - packages/google-cloud-enterpriseknowledgegraph/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-enterpriseknowledgegraph/ - tag_format: '{id}-v{version}' - - id: google-cloud-essential-contacts - version: 1.11.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/essentialcontacts/v1 - service_config: essentialcontacts_v1.yaml - source_roots: - - packages/google-cloud-essential-contacts - preserve_regex: - - packages/google-cloud-essential-contacts/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-essential-contacts/ - tag_format: '{id}-v{version}' - - id: google-cloud-eventarc - version: 1.17.0 - last_generated_commit: c9ff4f1cd26f1fe63e6d1c11a198366b70ebdb84 - apis: - - path: google/cloud/eventarc/v1 - service_config: eventarc_v1.yaml - source_roots: - - packages/google-cloud-eventarc - preserve_regex: - - packages/google-cloud-eventarc/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-eventarc/ - tag_format: '{id}-v{version}' - - id: google-cloud-eventarc-publishing - version: 0.8.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/eventarc/publishing/v1 - service_config: eventarcpublishing_v1.yaml - source_roots: - - packages/google-cloud-eventarc-publishing - preserve_regex: - - packages/google-cloud-eventarc-publishing/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-eventarc-publishing/ - tag_format: '{id}-v{version}' - - id: google-cloud-filestore - version: 1.14.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/filestore/v1 - service_config: file_v1.yaml - source_roots: - - packages/google-cloud-filestore - preserve_regex: - - packages/google-cloud-filestore/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-filestore/ - tag_format: '{id}-v{version}' - - id: google-cloud-financialservices - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/financialservices/v1 - service_config: financialservices_v1.yaml - source_roots: - - packages/google-cloud-financialservices - preserve_regex: - - packages/google-cloud-financialservices/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-financialservices/ - tag_format: '{id}-v{version}' - - id: google-cloud-functions - version: 1.21.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/functions/v2 - service_config: cloudfunctions_v2.yaml - - path: google/cloud/functions/v1 - service_config: cloudfunctions_v1.yaml - source_roots: - - packages/google-cloud-functions - preserve_regex: - - packages/google-cloud-functions/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-functions/ - tag_format: '{id}-v{version}' - - id: google-cloud-gdchardwaremanagement - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/gdchardwaremanagement/v1alpha - service_config: gdchardwaremanagement_v1alpha.yaml - source_roots: - - packages/google-cloud-gdchardwaremanagement - preserve_regex: - - packages/google-cloud-gdchardwaremanagement/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-gdchardwaremanagement/ - tag_format: '{id}-v{version}' - - id: google-cloud-geminidataanalytics - version: 0.6.0 - last_generated_commit: cf0434f4bd20618db60ddd16a1e7db2c0dfb9158 - apis: - - path: google/cloud/geminidataanalytics/v1beta - service_config: geminidataanalytics_v1beta.yaml - - path: google/cloud/geminidataanalytics/v1alpha - service_config: geminidataanalytics_v1alpha.yaml - source_roots: - - packages/google-cloud-geminidataanalytics - preserve_regex: - - packages/google-cloud-geminidataanalytics/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-geminidataanalytics/ - tag_format: '{id}-v{version}' - - id: google-cloud-gke-backup - version: 0.6.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/gkebackup/v1 - service_config: gkebackup_v1.yaml - source_roots: - - packages/google-cloud-gke-backup - preserve_regex: - - packages/google-cloud-gke-backup/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-gke-backup/ - tag_format: '{id}-v{version}' - - id: google-cloud-gke-connect-gateway - version: 0.11.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/gkeconnect/gateway/v1beta1 - service_config: connectgateway_v1beta1.yaml - - path: google/cloud/gkeconnect/gateway/v1 - service_config: connectgateway_v1.yaml - source_roots: - - packages/google-cloud-gke-connect-gateway - preserve_regex: - - packages/google-cloud-gke-connect-gateway/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-gke-connect-gateway/ - tag_format: '{id}-v{version}' - - id: google-cloud-gke-hub - version: 1.19.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/gkehub/v1 - service_config: gkehub_v1.yaml - - path: google/cloud/gkehub/v1beta1 - service_config: gkehub_v1beta1.yaml - source_roots: - - packages/google-cloud-gke-hub - preserve_regex: - - packages/google-cloud-gke-hub/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - docs/gkehub_v1/configmanagement_v1 - - docs/gkehub_v1/multiclusteringress_v1 - - google/cloud/gkehub_v1/configmanagement_v1 - - google/cloud/gkehub_v1/multiclusteringress_v1 - remove_regex: - - packages/google-cloud-gke-hub - tag_format: '{id}-v{version}' - - id: google-cloud-gke-multicloud - version: 0.6.22 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/gkemulticloud/v1 - service_config: gkemulticloud_v1.yaml - source_roots: - - packages/google-cloud-gke-multicloud - preserve_regex: - - packages/google-cloud-gke-multicloud/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-gke-multicloud - tag_format: '{id}-v{version}' - - id: google-cloud-gkerecommender - version: 0.1.0 - last_generated_commit: 94ccdfe4519e0ba817bd33aa22eb9c64f88a6874 - apis: - - path: google/cloud/gkerecommender/v1 - service_config: gkerecommender_v1.yaml - source_roots: - - packages/google-cloud-gkerecommender - preserve_regex: - - packages/google-cloud-gkerecommender/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-gkerecommender - tag_format: '{id}-v{version}' - - id: google-cloud-gsuiteaddons - version: 0.3.18 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/gsuiteaddons/v1 - service_config: gsuiteaddons_v1.yaml - source_roots: - - packages/google-cloud-gsuiteaddons - preserve_regex: - - packages/google-cloud-gsuiteaddons/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-gsuiteaddons - tag_format: '{id}-v{version}' - - id: google-cloud-hypercomputecluster - version: 0.1.0 - last_generated_commit: b6bb60733a7314d0c45e294b12d563fd6194b8f5 - apis: - - path: google/cloud/hypercomputecluster/v1beta - service_config: hypercomputecluster_v1beta.yaml - source_roots: - - packages/google-cloud-hypercomputecluster - preserve_regex: - - packages/google-cloud-hypercomputecluster/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-hypercomputecluster - tag_format: '{id}-v{version}' - - id: google-cloud-iam - version: 2.20.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/iam/v3 - service_config: iam_v3.yaml - - path: google/iam/v3beta - service_config: iam_v3beta.yaml - - path: google/iam/admin/v1 - service_config: iam.yaml - - path: google/iam/v2 - service_config: iam_v2.yaml - - path: google/iam/credentials/v1 - service_config: iamcredentials_v1.yaml - - path: google/iam/v2beta - service_config: iam_v2beta.yaml - source_roots: - - packages/google-cloud-iam - preserve_regex: - - packages/google-cloud-iam/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-iam - tag_format: '{id}-v{version}' - - id: google-cloud-iam-logging - version: 1.5.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/iam/v1/logging - service_config: "" - source_roots: - - packages/google-cloud-iam-logging - preserve_regex: - - packages/google-cloud-iam-logging/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/gapic/iam_logging_v1/test_iam_logging.py - remove_regex: - - packages/google-cloud-iam-logging/ - tag_format: '{id}-v{version}' - - id: google-cloud-iap - version: 1.18.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/iap/v1 - service_config: iap_v1.yaml - source_roots: - - packages/google-cloud-iap - preserve_regex: - - packages/google-cloud-iap/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-iap/ - tag_format: '{id}-v{version}' - - id: google-cloud-ids - version: 1.11.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/ids/v1 - service_config: ids_v1.yaml - source_roots: - - packages/google-cloud-ids - preserve_regex: - - packages/google-cloud-ids/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-ids/ - tag_format: '{id}-v{version}' - - id: google-cloud-kms - version: 3.7.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/kms/v1 - service_config: cloudkms_v1.yaml - source_roots: - - packages/google-cloud-kms - preserve_regex: - - packages/google-cloud-kms/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-kms/ - tag_format: '{id}-v{version}' - - id: google-cloud-kms-inventory - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/kms/inventory/v1 - service_config: kmsinventory_v1.yaml - source_roots: - - packages/google-cloud-kms-inventory - preserve_regex: - - packages/google-cloud-kms-inventory/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-kms-inventory/ - tag_format: '{id}-v{version}' - - id: google-cloud-language - version: 2.18.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/language/v1 - service_config: language_v1.yaml - - path: google/cloud/language/v1beta2 - service_config: language_v1beta2.yaml - - path: google/cloud/language/v2 - service_config: language_v2.yaml - source_roots: - - packages/google-cloud-language - preserve_regex: - - packages/google-cloud-language/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-language/ - tag_format: '{id}-v{version}' - - id: google-cloud-licensemanager - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/licensemanager/v1 - service_config: licensemanager_v1.yaml - source_roots: - - packages/google-cloud-licensemanager - preserve_regex: - - packages/google-cloud-licensemanager/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-licensemanager/ - tag_format: '{id}-v{version}' - - id: google-cloud-life-sciences - version: 0.10.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/lifesciences/v2beta - service_config: lifesciences_v2beta.yaml - source_roots: - - packages/google-cloud-life-sciences - preserve_regex: - - packages/google-cloud-life-sciences/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-life-sciences/ - tag_format: '{id}-v{version}' - - id: google-cloud-locationfinder - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/locationfinder/v1 - service_config: cloudlocationfinder_v1.yaml - source_roots: - - packages/google-cloud-locationfinder - preserve_regex: - - packages/google-cloud-locationfinder/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-locationfinder/ - tag_format: '{id}-v{version}' - - id: google-cloud-lustre - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/lustre/v1 - service_config: lustre_v1.yaml - source_roots: - - packages/google-cloud-lustre - preserve_regex: - - packages/google-cloud-lustre/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-lustre/ - tag_format: '{id}-v{version}' - - id: google-cloud-maintenance-api - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/maintenance/api/v1beta - service_config: maintenance_v1beta.yaml - source_roots: - - packages/google-cloud-maintenance-api - preserve_regex: - - packages/google-cloud-maintenance-api/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-maintenance-api/ - tag_format: '{id}-v{version}' - - id: google-cloud-managed-identities - version: 1.13.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/managedidentities/v1 - service_config: managedidentities_v1.yaml - source_roots: - - packages/google-cloud-managed-identities - preserve_regex: - - packages/google-cloud-managed-identities/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-managed-identities/ - tag_format: '{id}-v{version}' - - id: google-cloud-managedkafka - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/managedkafka/v1 - service_config: managedkafka_v1.yaml - source_roots: - - packages/google-cloud-managedkafka - preserve_regex: - - packages/google-cloud-managedkafka/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-managedkafka/ - tag_format: '{id}-v{version}' - - id: google-cloud-managedkafka-schemaregistry - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/managedkafka/schemaregistry/v1 - service_config: managedkafka_v1.yaml - source_roots: - - packages/google-cloud-managedkafka-schemaregistry - preserve_regex: - - packages/google-cloud-managedkafka-schemaregistry/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-managedkafka-schemaregistry/ - tag_format: '{id}-v{version}' - - id: google-cloud-media-translation - version: 0.12.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/mediatranslation/v1beta1 - service_config: mediatranslation_v1beta1.yaml - source_roots: - - packages/google-cloud-media-translation - preserve_regex: - - packages/google-cloud-media-translation/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-media-translation/ - tag_format: '{id}-v{version}' - - id: google-cloud-memcache - version: 1.13.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/memcache/v1 - service_config: memcache_v1.yaml - - path: google/cloud/memcache/v1beta2 - service_config: memcache_v1beta2.yaml - source_roots: - - packages/google-cloud-memcache - preserve_regex: - - packages/google-cloud-memcache/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-memcache/ - tag_format: '{id}-v{version}' - - id: google-cloud-memorystore - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/memorystore/v1beta - service_config: memorystore_v1beta.yaml - - path: google/cloud/memorystore/v1 - service_config: memorystore_v1.yaml - source_roots: - - packages/google-cloud-memorystore - preserve_regex: - - packages/google-cloud-memorystore/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-memorystore/ - tag_format: '{id}-v{version}' - - id: google-cloud-migrationcenter - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/migrationcenter/v1 - service_config: migrationcenter_v1.yaml - source_roots: - - packages/google-cloud-migrationcenter - preserve_regex: - - packages/google-cloud-migrationcenter/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-migrationcenter/ - tag_format: '{id}-v{version}' - - id: google-cloud-modelarmor - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/modelarmor/v1beta - service_config: modelarmor_v1beta.yaml - - path: google/cloud/modelarmor/v1 - service_config: modelarmor_v1.yaml - source_roots: - - packages/google-cloud-modelarmor - preserve_regex: - - packages/google-cloud-modelarmor/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-modelarmor/ - tag_format: '{id}-v{version}' - - id: google-cloud-monitoring - version: 2.28.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/monitoring/v3 - service_config: monitoring.yaml - source_roots: - - packages/google-cloud-monitoring - preserve_regex: - - packages/google-cloud-monitoring/CHANGELOG.md - - docs/CHANGELOG.md - - docs/query.rst - - packages/google-cloud-monitoring/google/cloud/monitoring_v3/_dataframe.py - - packages/google-cloud-monitoring/google/cloud/monitoring_v3/query.py - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/test__dataframe.py - - tests/unit/test_query.py - remove_regex: - - packages/google-cloud-monitoring - tag_format: '{id}-v{version}' - - id: google-cloud-monitoring-dashboards - version: 2.19.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/monitoring/dashboard/v1 - service_config: monitoring.yaml - source_roots: - - packages/google-cloud-monitoring-dashboards - preserve_regex: - - packages/google-cloud-monitoring-dashboards/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - packages/google-cloud-monitoring-dashboards/google/monitoring - - tests/unit/gapic/dashboard_v1 - remove_regex: - - packages/google-cloud-monitoring-dashboards - tag_format: '{id}-v{version}' - - id: google-cloud-monitoring-metrics-scopes - version: 1.10.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/monitoring/metricsscope/v1 - service_config: monitoring.yaml - source_roots: - - packages/google-cloud-monitoring-metrics-scopes - preserve_regex: - - packages/google-cloud-monitoring-metrics-scopes/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-monitoring-metrics-scopes/ - tag_format: '{id}-v{version}' - - id: google-cloud-netapp - version: 0.4.0 - last_generated_commit: c9ff4f1cd26f1fe63e6d1c11a198366b70ebdb84 - apis: - - path: google/cloud/netapp/v1 - service_config: netapp_v1.yaml - source_roots: - - packages/google-cloud-netapp - preserve_regex: - - packages/google-cloud-netapp/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-netapp/ - tag_format: '{id}-v{version}' - - id: google-cloud-network-connectivity - version: 2.11.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/networkconnectivity/v1 - service_config: networkconnectivity_v1.yaml - - path: google/cloud/networkconnectivity/v1alpha1 - service_config: networkconnectivity_v1alpha1.yaml - source_roots: - - packages/google-cloud-network-connectivity - preserve_regex: - - packages/google-cloud-network-connectivity/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-network-connectivity/ - tag_format: '{id}-v{version}' - - id: google-cloud-network-management - version: 1.30.0 - last_generated_commit: 53f97391f3451398f7b53c7f86dabd325d205677 - apis: - - path: google/cloud/networkmanagement/v1 - service_config: networkmanagement_v1.yaml - source_roots: - - packages/google-cloud-network-management - preserve_regex: - - packages/google-cloud-network-management/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-network-management/ - tag_format: '{id}-v{version}' - - id: google-cloud-network-security - version: 0.9.21 - last_generated_commit: c9ff4f1cd26f1fe63e6d1c11a198366b70ebdb84 - apis: - - path: google/cloud/networksecurity/v1alpha1 - service_config: networksecurity_v1alpha1.yaml - - path: google/cloud/networksecurity/v1beta1 - service_config: networksecurity_v1beta1.yaml - - path: google/cloud/networksecurity/v1 - service_config: networksecurity_v1.yaml - source_roots: - - packages/google-cloud-network-security - preserve_regex: - - packages/google-cloud-network-security/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-network-security - tag_format: '{id}-v{version}' - - id: google-cloud-network-services - version: 0.7.0 - last_generated_commit: 53f97391f3451398f7b53c7f86dabd325d205677 - apis: - - path: google/cloud/networkservices/v1 - service_config: networkservices_v1.yaml - source_roots: - - packages/google-cloud-network-services - preserve_regex: - - packages/google-cloud-network-services/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-network-services/ - tag_format: '{id}-v{version}' - - id: google-cloud-notebooks - version: 1.14.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/notebooks/v1beta1 - service_config: notebooks_v1beta1.yaml - - path: google/cloud/notebooks/v1 - service_config: notebooks_v1.yaml - - path: google/cloud/notebooks/v2 - service_config: notebooks_v2.yaml - source_roots: - - packages/google-cloud-notebooks - preserve_regex: - - packages/google-cloud-notebooks/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-notebooks/ - tag_format: '{id}-v{version}' - - id: google-cloud-optimization - version: 1.12.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/optimization/v1 - service_config: cloudoptimization_v1.yaml - source_roots: - - packages/google-cloud-optimization - preserve_regex: - - packages/google-cloud-optimization/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-optimization/ - tag_format: '{id}-v{version}' - - id: google-cloud-oracledatabase - version: 0.3.0 - last_generated_commit: 94ccdfe4519e0ba817bd33aa22eb9c64f88a6874 - apis: - - path: google/cloud/oracledatabase/v1 - service_config: oracledatabase_v1.yaml - source_roots: - - packages/google-cloud-oracledatabase - preserve_regex: - - packages/google-cloud-oracledatabase/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-oracledatabase/ - tag_format: '{id}-v{version}' - - id: google-cloud-orchestration-airflow - version: 1.18.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/orchestration/airflow/service/v1 - service_config: composer_v1.yaml - - path: google/cloud/orchestration/airflow/service/v1beta1 - service_config: composer_v1beta1.yaml - source_roots: - - packages/google-cloud-orchestration-airflow - preserve_regex: - - packages/google-cloud-orchestration-airflow/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-orchestration-airflow/ - tag_format: '{id}-v{version}' - - id: google-cloud-org-policy - version: 1.15.0 - last_generated_commit: 55319b058f8a0e46bbeeff30e374e4b1f081f494 - apis: - - path: google/cloud/orgpolicy/v1 - service_config: "" - - path: google/cloud/orgpolicy/v2 - service_config: orgpolicy_v2.yaml - source_roots: - - packages/google-cloud-org-policy - preserve_regex: - - packages/google-cloud-org-policy/pytest.ini - - packages/google-cloud-org-policy/CHANGELOG.md - - google/cloud/orgpolicy/v1/__init__.py - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/test_packaging.py - remove_regex: - - packages/google-cloud-org-policy - tag_format: '{id}-v{version}' - - id: google-cloud-os-config - version: 1.22.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/osconfig/v1alpha - service_config: osconfig_v1alpha.yaml - - path: google/cloud/osconfig/v1 - service_config: osconfig_v1.yaml - source_roots: - - packages/google-cloud-os-config - preserve_regex: - - packages/google-cloud-os-config/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-os-config/ - tag_format: '{id}-v{version}' - - id: google-cloud-os-login - version: 2.18.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/oslogin/v1 - service_config: oslogin_v1.yaml - source_roots: - - packages/google-cloud-os-login - preserve_regex: - - packages/google-cloud-os-login/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - google/cloud/oslogin_v1/common - - docs/oslogin_v1/common/types.rst - remove_regex: - - packages/google-cloud-os-login - tag_format: '{id}-v{version}' - - id: google-cloud-parallelstore - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/parallelstore/v1 - service_config: parallelstore_v1.yaml - - path: google/cloud/parallelstore/v1beta - service_config: parallelstore_v1beta.yaml - source_roots: - - packages/google-cloud-parallelstore - preserve_regex: - - packages/google-cloud-parallelstore/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-parallelstore/ - tag_format: '{id}-v{version}' - - id: google-cloud-parametermanager - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/parametermanager/v1 - service_config: parametermanager_v1.yaml - source_roots: - - packages/google-cloud-parametermanager - preserve_regex: - - packages/google-cloud-parametermanager/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-parametermanager/ - tag_format: '{id}-v{version}' - - id: google-cloud-phishing-protection - version: 1.15.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/phishingprotection/v1beta1 - service_config: phishingprotection_v1beta1.yaml - source_roots: - - packages/google-cloud-phishing-protection - preserve_regex: - - packages/google-cloud-phishing-protection/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-phishing-protection/ - tag_format: '{id}-v{version}' - - id: google-cloud-policy-troubleshooter - version: 1.14.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/policytroubleshooter/v1 - service_config: policytroubleshooter_v1.yaml - source_roots: - - packages/google-cloud-policy-troubleshooter - preserve_regex: - - packages/google-cloud-policy-troubleshooter/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-policy-troubleshooter/ - tag_format: '{id}-v{version}' - - id: google-cloud-policysimulator - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/policysimulator/v1 - service_config: policysimulator_v1.yaml - source_roots: - - packages/google-cloud-policysimulator - preserve_regex: - - packages/google-cloud-policysimulator/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-policysimulator/ - tag_format: '{id}-v{version}' - - id: google-cloud-policytroubleshooter-iam - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/policytroubleshooter/iam/v3 - service_config: policytroubleshooter_v3.yaml - source_roots: - - packages/google-cloud-policytroubleshooter-iam - preserve_regex: - - packages/google-cloud-policytroubleshooter-iam/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-policytroubleshooter-iam/ - tag_format: '{id}-v{version}' - - id: google-cloud-private-ca - version: 1.16.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/security/privateca/v1 - service_config: privateca_v1.yaml - - path: google/cloud/security/privateca/v1beta1 - service_config: privateca_v1beta1.yaml - source_roots: - - packages/google-cloud-private-ca - preserve_regex: - - packages/google-cloud-private-ca/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-private-ca/ - tag_format: '{id}-v{version}' - - id: google-cloud-private-catalog - version: 0.10.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/privatecatalog/v1beta1 - service_config: cloudprivatecatalog_v1beta1.yaml - source_roots: - - packages/google-cloud-private-catalog - preserve_regex: - - packages/google-cloud-private-catalog/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-private-catalog/ - tag_format: '{id}-v{version}' - - id: google-cloud-privilegedaccessmanager - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/privilegedaccessmanager/v1 - service_config: privilegedaccessmanager_v1.yaml - source_roots: - - packages/google-cloud-privilegedaccessmanager - preserve_regex: - - packages/google-cloud-privilegedaccessmanager/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-privilegedaccessmanager/ - tag_format: '{id}-v{version}' - - id: google-cloud-quotas - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/api/cloudquotas/v1 - service_config: cloudquotas_v1.yaml - - path: google/api/cloudquotas/v1beta - service_config: cloudquotas_v1beta.yaml - source_roots: - - packages/google-cloud-quotas - preserve_regex: - - packages/google-cloud-quotas/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-quotas/ - tag_format: '{id}-v{version}' - - id: google-cloud-rapidmigrationassessment - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/rapidmigrationassessment/v1 - service_config: rapidmigrationassessment_v1.yaml - source_roots: - - packages/google-cloud-rapidmigrationassessment - preserve_regex: - - packages/google-cloud-rapidmigrationassessment/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-rapidmigrationassessment/ - tag_format: '{id}-v{version}' - - id: google-cloud-recaptcha-enterprise - version: 1.29.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/recaptchaenterprise/v1 - service_config: recaptchaenterprise_v1.yaml - source_roots: - - packages/google-cloud-recaptcha-enterprise - preserve_regex: - - packages/google-cloud-recaptcha-enterprise/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-recaptcha-enterprise/ - tag_format: '{id}-v{version}' - - id: google-cloud-recommendations-ai - version: 0.11.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/recommendationengine/v1beta1 - service_config: recommendationengine_v1beta1.yaml - source_roots: - - packages/google-cloud-recommendations-ai - preserve_regex: - - packages/google-cloud-recommendations-ai/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-recommendations-ai/ - tag_format: '{id}-v{version}' - - id: google-cloud-recommender - version: 2.19.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/recommender/v1beta1 - service_config: recommender_v1beta1.yaml - - path: google/cloud/recommender/v1 - service_config: recommender_v1.yaml - source_roots: - - packages/google-cloud-recommender - preserve_regex: - - packages/google-cloud-recommender/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-recommender/ - tag_format: '{id}-v{version}' - - id: google-cloud-redis - version: 2.19.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/redis/v1 - service_config: redis_v1.yaml - - path: google/cloud/redis/v1beta1 - service_config: redis_v1beta1.yaml - source_roots: - - packages/google-cloud-redis - preserve_regex: - - packages/google-cloud-redis/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-redis/ - tag_format: '{id}-v{version}' - - id: google-cloud-redis-cluster - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/redis/cluster/v1 - service_config: redis_v1.yaml - - path: google/cloud/redis/cluster/v1beta1 - service_config: redis_v1beta1.yaml - source_roots: - - packages/google-cloud-redis-cluster - preserve_regex: - - packages/google-cloud-redis-cluster/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-redis-cluster/ - tag_format: '{id}-v{version}' - - id: google-cloud-resource-manager - version: 1.15.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/resourcemanager/v3 - service_config: cloudresourcemanager_v3.yaml - source_roots: - - packages/google-cloud-resource-manager - preserve_regex: - - packages/google-cloud-resource-manager/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-resource-manager/ - tag_format: '{id}-v{version}' - - id: google-cloud-retail - version: 2.7.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/retail/v2 - service_config: retail_v2.yaml - - path: google/cloud/retail/v2alpha - service_config: retail_v2alpha.yaml - - path: google/cloud/retail/v2beta - service_config: retail_v2beta.yaml - source_roots: - - packages/google-cloud-retail - preserve_regex: - - packages/google-cloud-retail/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-retail/ - tag_format: '{id}-v{version}' - - id: google-cloud-run - version: 0.12.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/run/v2 - service_config: run_v2.yaml - source_roots: - - packages/google-cloud-run - preserve_regex: - - packages/google-cloud-run/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-run/ - tag_format: '{id}-v{version}' - - id: google-cloud-saasplatform-saasservicemgmt - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/saasplatform/saasservicemgmt/v1beta1 - service_config: saasservicemgmt_v1beta1.yaml - source_roots: - - packages/google-cloud-saasplatform-saasservicemgmt - preserve_regex: - - packages/google-cloud-saasplatform-saasservicemgmt/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-saasplatform-saasservicemgmt/ - tag_format: '{id}-v{version}' - - id: google-cloud-scheduler - version: 2.17.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/scheduler/v1 - service_config: cloudscheduler_v1.yaml - - path: google/cloud/scheduler/v1beta1 - service_config: cloudscheduler_v1beta1.yaml - source_roots: - - packages/google-cloud-scheduler - preserve_regex: - - packages/google-cloud-scheduler/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-scheduler/ - tag_format: '{id}-v{version}' - - id: google-cloud-secret-manager - version: 2.25.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/secretmanager/v1 - service_config: secretmanager_v1.yaml - - path: google/cloud/secretmanager/v1beta2 - service_config: secretmanager_v1beta2.yaml - - path: google/cloud/secrets/v1beta1 - service_config: secretmanager_v1beta1.yaml - source_roots: - - packages/google-cloud-secret-manager - preserve_regex: - - packages/google-cloud-secret-manager/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-secret-manager - tag_format: '{id}-v{version}' - - id: google-cloud-securesourcemanager - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/securesourcemanager/v1 - service_config: securesourcemanager_v1.yaml - source_roots: - - packages/google-cloud-securesourcemanager - preserve_regex: - - packages/google-cloud-securesourcemanager/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-securesourcemanager/ - tag_format: '{id}-v{version}' - - id: google-cloud-security-publicca - version: 0.4.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/security/publicca/v1 - service_config: publicca_v1.yaml - - path: google/cloud/security/publicca/v1beta1 - service_config: publicca_v1beta1.yaml - source_roots: - - packages/google-cloud-security-publicca - preserve_regex: - - packages/google-cloud-security-publicca/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-security-publicca/ - tag_format: '{id}-v{version}' - - id: google-cloud-securitycenter - version: 1.41.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/securitycenter/v2 - service_config: securitycenter_v2.yaml - - path: google/cloud/securitycenter/v1p1beta1 - service_config: securitycenter_v1p1beta1.yaml - - path: google/cloud/securitycenter/v1beta1 - service_config: securitycenter_v1beta1.yaml - - path: google/cloud/securitycenter/v1 - service_config: securitycenter_v1.yaml - source_roots: - - packages/google-cloud-securitycenter - preserve_regex: - - packages/google-cloud-securitycenter/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-securitycenter/ - tag_format: '{id}-v{version}' - - id: google-cloud-securitycentermanagement - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/securitycentermanagement/v1 - service_config: securitycentermanagement_v1.yaml - source_roots: - - packages/google-cloud-securitycentermanagement - preserve_regex: - - packages/google-cloud-securitycentermanagement/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-securitycentermanagement/ - tag_format: '{id}-v{version}' - - id: google-cloud-service-control - version: 1.17.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/api/servicecontrol/v2 - service_config: servicecontrol.yaml - - path: google/api/servicecontrol/v1 - service_config: servicecontrol.yaml - source_roots: - - packages/google-cloud-service-control - preserve_regex: - - packages/google-cloud-service-control/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-service-control/ - tag_format: '{id}-v{version}' - - id: google-cloud-service-directory - version: 1.15.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/servicedirectory/v1 - service_config: servicedirectory_v1.yaml - - path: google/cloud/servicedirectory/v1beta1 - service_config: servicedirectory_v1beta1.yaml - source_roots: - - packages/google-cloud-service-directory - preserve_regex: - - packages/google-cloud-service-directory/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-service-directory/ - tag_format: '{id}-v{version}' - - id: google-cloud-service-management - version: 1.14.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/api/servicemanagement/v1 - service_config: servicemanagement_v1.yaml - source_roots: - - packages/google-cloud-service-management - preserve_regex: - - packages/google-cloud-service-management/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-service-management/ - tag_format: '{id}-v{version}' - - id: google-cloud-service-usage - version: 1.14.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/api/serviceusage/v1 - service_config: serviceusage_v1.yaml - source_roots: - - packages/google-cloud-service-usage - preserve_regex: - - packages/google-cloud-service-usage/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-service-usage/ - tag_format: '{id}-v{version}' - - id: google-cloud-servicehealth - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/servicehealth/v1 - service_config: servicehealth_v1.yaml - source_roots: - - packages/google-cloud-servicehealth - preserve_regex: - - packages/google-cloud-servicehealth/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-servicehealth/ - tag_format: '{id}-v{version}' - - id: google-cloud-shell - version: 1.13.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/shell/v1 - service_config: cloudshell_v1.yaml - source_roots: - - packages/google-cloud-shell - preserve_regex: - - packages/google-cloud-shell/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-shell/ - tag_format: '{id}-v{version}' - - id: google-cloud-source-context - version: 1.8.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/devtools/source/v1 - service_config: "" - source_roots: - - packages/google-cloud-source-context - preserve_regex: - - packages/google-cloud-source-context/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/gapic/source_context_v1/test_source_context_v1.py - remove_regex: - - packages/google-cloud-source-context/ - tag_format: '{id}-v{version}' - - id: google-cloud-speech - version: 2.34.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/speech/v1 - service_config: speech_v1.yaml - - path: google/cloud/speech/v2 - service_config: speech_v2.yaml - - path: google/cloud/speech/v1p1beta1 - service_config: speech_v1p1beta1.yaml - source_roots: - - packages/google-cloud-speech - preserve_regex: - - packages/google-cloud-speech/CHANGELOG.md - - docs/CHANGELOG.md - - google/cloud/speech_v1/helpers.py - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/test_helpers.py - remove_regex: - - packages/google-cloud-speech/ - tag_format: '{id}-v{version}' - - id: google-cloud-storage-control - version: 1.8.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/storage/control/v2 - service_config: storage_v2.yaml - source_roots: - - packages/google-cloud-storage-control - preserve_regex: - - packages/google-cloud-storage-control/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-storage-control/ - tag_format: '{id}-v{version}' - - id: google-cloud-storage-transfer - version: 1.18.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/storagetransfer/v1 - service_config: storagetransfer_v1.yaml - source_roots: - - packages/google-cloud-storage-transfer - preserve_regex: - - packages/google-cloud-storage-transfer/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-storage-transfer/ - tag_format: '{id}-v{version}' - - id: google-cloud-storagebatchoperations - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/storagebatchoperations/v1 - service_config: storagebatchoperations_v1.yaml - source_roots: - - packages/google-cloud-storagebatchoperations - preserve_regex: - - packages/google-cloud-storagebatchoperations/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-storagebatchoperations/ - tag_format: '{id}-v{version}' - - id: google-cloud-storageinsights - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/storageinsights/v1 - service_config: storageinsights_v1.yaml - source_roots: - - packages/google-cloud-storageinsights - preserve_regex: - - packages/google-cloud-storageinsights/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-storageinsights/ - tag_format: '{id}-v{version}' - - id: google-cloud-support - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/support/v2beta - service_config: cloudsupport_v2beta.yaml - - path: google/cloud/support/v2 - service_config: cloudsupport_v2.yaml - source_roots: - - packages/google-cloud-support - preserve_regex: - - packages/google-cloud-support/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-support/ - tag_format: '{id}-v{version}' - - id: google-cloud-talent - version: 2.18.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/talent/v4beta1 - service_config: jobs_v4beta1.yaml - - path: google/cloud/talent/v4 - service_config: jobs_v4.yaml - source_roots: - - packages/google-cloud-talent - preserve_regex: - - packages/google-cloud-talent/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-talent/ - tag_format: '{id}-v{version}' - - id: google-cloud-tasks - version: 2.20.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/tasks/v2beta2 - service_config: cloudtasks_v2beta2.yaml - - path: google/cloud/tasks/v2beta3 - service_config: cloudtasks_v2beta3.yaml - - path: google/cloud/tasks/v2 - service_config: cloudtasks_v2.yaml - source_roots: - - packages/google-cloud-tasks - preserve_regex: - - packages/google-cloud-tasks/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - snippets/README.md - - tests/system - remove_regex: - - packages/google-cloud-tasks/ - tag_format: '{id}-v{version}' - - id: google-cloud-telcoautomation - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/telcoautomation/v1 - service_config: telcoautomation_v1.yaml - - path: google/cloud/telcoautomation/v1alpha1 - service_config: telcoautomation_v1alpha1.yaml - source_roots: - - packages/google-cloud-telcoautomation - preserve_regex: - - packages/google-cloud-telcoautomation/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - snippets/README.md - - tests/system - remove_regex: - - packages/google-cloud-telcoautomation/ - tag_format: '{id}-v{version}' - - id: google-cloud-texttospeech - version: 2.33.0 - last_generated_commit: c288189b43c016dd3cf1ec73ce3cadee8b732f07 - apis: - - path: google/cloud/texttospeech/v1 - service_config: texttospeech_v1.yaml - - path: google/cloud/texttospeech/v1beta1 - service_config: texttospeech_v1beta1.yaml - source_roots: - - packages/google-cloud-texttospeech - preserve_regex: - - packages/google-cloud-texttospeech/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-texttospeech/ - tag_format: '{id}-v{version}' - - id: google-cloud-tpu - version: 1.24.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/tpu/v2alpha1 - service_config: tpu_v2alpha1.yaml - - path: google/cloud/tpu/v2 - service_config: tpu_v2.yaml - - path: google/cloud/tpu/v1 - service_config: tpu_v1.yaml - source_roots: - - packages/google-cloud-tpu - preserve_regex: - - packages/google-cloud-tpu/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-tpu/ - tag_format: '{id}-v{version}' - - id: google-cloud-trace - version: 1.17.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/devtools/cloudtrace/v2 - service_config: cloudtrace_v2.yaml - - path: google/devtools/cloudtrace/v1 - service_config: cloudtrace_v1.yaml - source_roots: - - packages/google-cloud-trace - preserve_regex: - - packages/google-cloud-trace/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-trace/ - tag_format: '{id}-v{version}' - - id: google-cloud-translate - version: 3.23.0 - last_generated_commit: 53f97391f3451398f7b53c7f86dabd325d205677 - apis: - - path: google/cloud/translate/v3beta1 - service_config: translate_v3beta1.yaml - - path: google/cloud/translate/v3 - service_config: translate_v3.yaml - source_roots: - - packages/google-cloud-translate - preserve_regex: - - packages/google-cloud-translate/CHANGELOG.md - - docs/CHANGELOG.md - - docs/client.rst - - docs/v2.rst - - google/cloud/translate_v2 - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/v2 - remove_regex: - - packages/google-cloud-translate/ - tag_format: '{id}-v{version}' - - id: google-cloud-vectorsearch - version: 0.2.0 - last_generated_commit: ded7ed1e4cce7c165c56a417572cebea9bc1d82c - apis: - - path: google/cloud/vectorsearch/v1beta - service_config: vectorsearch_v1beta.yaml - source_roots: - - packages/google-cloud-vectorsearch - preserve_regex: - - packages/google-cloud-vectorsearch/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-vectorsearch - tag_format: '{id}-v{version}' - - id: google-cloud-video-live-stream - version: 1.14.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/video/livestream/v1 - service_config: livestream_v1.yaml - source_roots: - - packages/google-cloud-video-live-stream - preserve_regex: - - packages/google-cloud-video-live-stream/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-video-live-stream/ - tag_format: '{id}-v{version}' - - id: google-cloud-video-stitcher - version: 0.9.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/video/stitcher/v1 - service_config: videostitcher_v1.yaml - source_roots: - - packages/google-cloud-video-stitcher - preserve_regex: - - packages/google-cloud-video-stitcher/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-video-stitcher/ - tag_format: '{id}-v{version}' - - id: google-cloud-video-transcoder - version: 1.18.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/video/transcoder/v1 - service_config: transcoder_v1.yaml - source_roots: - - packages/google-cloud-video-transcoder - preserve_regex: - - packages/google-cloud-video-transcoder/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-video-transcoder/ - tag_format: '{id}-v{version}' - - id: google-cloud-videointelligence - version: 2.17.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/videointelligence/v1p3beta1 - service_config: videointelligence_v1p3beta1.yaml - - path: google/cloud/videointelligence/v1 - service_config: videointelligence_v1.yaml - - path: google/cloud/videointelligence/v1p2beta1 - service_config: videointelligence_v1p2beta1.yaml - - path: google/cloud/videointelligence/v1p1beta1 - service_config: videointelligence_v1p1beta1.yaml - - path: google/cloud/videointelligence/v1beta2 - service_config: videointelligence_v1beta2.yaml - source_roots: - - packages/google-cloud-videointelligence - preserve_regex: - - packages/google-cloud-videointelligence/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-videointelligence/ - tag_format: '{id}-v{version}' - - id: google-cloud-vision - version: 3.11.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/vision/v1p3beta1 - service_config: vision_v1p3beta1.yaml - - path: google/cloud/vision/v1 - service_config: vision_v1.yaml - - path: google/cloud/vision/v1p1beta1 - service_config: vision_v1p1beta1.yaml - - path: google/cloud/vision/v1p2beta1 - service_config: vision_v1p2beta1.yaml - - path: google/cloud/vision/v1p4beta1 - service_config: vision_v1p4beta1.yaml - source_roots: - - packages/google-cloud-vision - preserve_regex: - - packages/google-cloud-vision/CHANGELOG.md - - docs/CHANGELOG.md - - google/cloud/vision_helpers - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/test_decorators.py - - tests/unit/test_helpers.py - remove_regex: - - packages/google-cloud-vision/ - tag_format: '{id}-v{version}' - - id: google-cloud-visionai - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/visionai/v1alpha1 - service_config: visionai_v1alpha1.yaml - - path: google/cloud/visionai/v1 - service_config: visionai_v1.yaml - source_roots: - - packages/google-cloud-visionai - preserve_regex: - - packages/google-cloud-visionai/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-visionai/ - tag_format: '{id}-v{version}' - - id: google-cloud-vm-migration - version: 1.13.0 - last_generated_commit: a17b84add8318f780fcc8a027815d5fee644b9f7 - apis: - - path: google/cloud/vmmigration/v1 - service_config: vmmigration_v1.yaml - source_roots: - - packages/google-cloud-vm-migration - preserve_regex: - - packages/google-cloud-vm-migration/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-vm-migration/ - tag_format: '{id}-v{version}' - - id: google-cloud-vmwareengine - version: 1.9.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/vmwareengine/v1 - service_config: vmwareengine_v1.yaml - source_roots: - - packages/google-cloud-vmwareengine - preserve_regex: - - packages/google-cloud-vmwareengine/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-vmwareengine/ - tag_format: '{id}-v{version}' - - id: google-cloud-vpc-access - version: 1.14.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/vpcaccess/v1 - service_config: vpcaccess_v1.yaml - source_roots: - - packages/google-cloud-vpc-access - preserve_regex: - - packages/google-cloud-vpc-access/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-vpc-access/ - tag_format: '{id}-v{version}' - - id: google-cloud-webrisk - version: 1.19.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/webrisk/v1beta1 - service_config: webrisk_v1beta1.yaml - - path: google/cloud/webrisk/v1 - service_config: webrisk_v1.yaml - source_roots: - - packages/google-cloud-webrisk - preserve_regex: - - packages/google-cloud-webrisk/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-webrisk/ - tag_format: '{id}-v{version}' - - id: google-cloud-websecurityscanner - version: 1.18.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/websecurityscanner/v1alpha - service_config: websecurityscanner_v1alpha.yaml - - path: google/cloud/websecurityscanner/v1beta - service_config: websecurityscanner_v1beta.yaml - - path: google/cloud/websecurityscanner/v1 - service_config: websecurityscanner_v1.yaml - source_roots: - - packages/google-cloud-websecurityscanner - preserve_regex: - - packages/google-cloud-websecurityscanner/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-websecurityscanner/ - tag_format: '{id}-v{version}' - - id: google-cloud-workflows - version: 1.19.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/workflows/executions/v1 - service_config: workflowexecutions_v1.yaml - - path: google/cloud/workflows/executions/v1beta - service_config: workflowexecutions_v1beta.yaml - - path: google/cloud/workflows/v1 - service_config: workflows_v1.yaml - - path: google/cloud/workflows/v1beta - service_config: workflows_v1beta.yaml - source_roots: - - packages/google-cloud-workflows - preserve_regex: - - packages/google-cloud-workflows/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-workflows/ - tag_format: '{id}-v{version}' - - id: google-cloud-workstations - version: 0.6.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/cloud/workstations/v1beta - service_config: workstations_v1beta.yaml - - path: google/cloud/workstations/v1 - service_config: workstations_v1.yaml - source_roots: - - packages/google-cloud-workstations - preserve_regex: - - packages/google-cloud-workstations/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-cloud-workstations/ - tag_format: '{id}-v{version}' - - id: google-geo-type - version: 0.4.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/geo/type - service_config: type_geo.yaml - source_roots: - - packages/google-geo-type - preserve_regex: - - packages/google-geo-type/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/gapic/type/test_type.py - remove_regex: - - packages/google-geo-type - tag_format: '{id}-v{version}' - - id: google-maps-addressvalidation - version: 0.4.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/maps/addressvalidation/v1 - service_config: addressvalidation_v1.yaml - source_roots: - - packages/google-maps-addressvalidation - preserve_regex: - - packages/google-maps-addressvalidation/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-maps-addressvalidation - tag_format: '{id}-v{version}' - - id: google-maps-areainsights - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/maps/areainsights/v1 - service_config: areainsights_v1.yaml - source_roots: - - packages/google-maps-areainsights - preserve_regex: - - packages/google-maps-areainsights/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-maps-areainsights - tag_format: '{id}-v{version}' - - id: google-maps-fleetengine - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/maps/fleetengine/v1 - service_config: fleetengine_v1.yaml - source_roots: - - packages/google-maps-fleetengine - preserve_regex: - - packages/google-maps-fleetengine/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-maps-fleetengine - tag_format: '{id}-v{version}' - - id: google-maps-fleetengine-delivery - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/maps/fleetengine/delivery/v1 - service_config: fleetengine_v1.yaml - source_roots: - - packages/google-maps-fleetengine-delivery - preserve_regex: - - packages/google-maps-fleetengine-delivery/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-maps-fleetengine-delivery - tag_format: '{id}-v{version}' - - id: google-maps-mapsplatformdatasets - version: 0.5.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/maps/mapsplatformdatasets/v1 - service_config: mapsplatformdatasets_v1.yaml - source_roots: - - packages/google-maps-mapsplatformdatasets - preserve_regex: - - packages/google-maps-mapsplatformdatasets/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-maps-mapsplatformdatasets - tag_format: '{id}-v{version}' - - id: google-maps-places - version: 0.5.0 - last_generated_commit: e8365a7f88fabe8717cb8322b8ce784b03b6daea - apis: - - path: google/maps/places/v1 - service_config: places_v1.yaml - source_roots: - - packages/google-maps-places - preserve_regex: - - packages/google-maps-places/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-maps-places - tag_format: '{id}-v{version}' - - id: google-maps-routeoptimization - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/maps/routeoptimization/v1 - service_config: routeoptimization_v1.yaml - source_roots: - - packages/google-maps-routeoptimization - preserve_regex: - - packages/google-maps-routeoptimization/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/README.rst - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-maps-routeoptimization - tag_format: '{id}-v{version}' - - id: google-maps-routing - version: 0.7.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/maps/routing/v2 - service_config: routes_v2.yaml - source_roots: - - packages/google-maps-routing - preserve_regex: - - packages/google-maps-routing/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-maps-routing - tag_format: '{id}-v{version}' - - id: google-maps-solar - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/maps/solar/v1 - service_config: solar_v1.yaml - source_roots: - - packages/google-maps-solar - preserve_regex: - - packages/google-maps-solar/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-maps-solar - tag_format: '{id}-v{version}' - - id: google-shopping-css - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/css/v1 - service_config: css_v1.yaml - source_roots: - - packages/google-shopping-css - preserve_regex: - - packages/google-shopping-css/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-css/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-accounts - version: 1.1.0 - last_generated_commit: a17b84add8318f780fcc8a027815d5fee644b9f7 - apis: - - path: google/shopping/merchant/accounts/v1 - service_config: merchantapi_v1.yaml - - path: google/shopping/merchant/accounts/v1beta - service_config: merchantapi_v1beta.yaml - source_roots: - - packages/google-shopping-merchant-accounts - preserve_regex: - - packages/google-shopping-merchant-accounts/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-accounts/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-conversions - version: 1.1.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/conversions/v1 - service_config: merchantapi_v1.yaml - - path: google/shopping/merchant/conversions/v1beta - service_config: merchantapi_v1beta.yaml - source_roots: - - packages/google-shopping-merchant-conversions - preserve_regex: - - packages/google-shopping-merchant-conversions/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-conversions/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-datasources - version: 1.2.0 - last_generated_commit: 53f97391f3451398f7b53c7f86dabd325d205677 - apis: - - path: google/shopping/merchant/datasources/v1 - service_config: merchantapi_v1.yaml - - path: google/shopping/merchant/datasources/v1beta - service_config: merchantapi_v1beta.yaml - source_roots: - - packages/google-shopping-merchant-datasources - preserve_regex: - - packages/google-shopping-merchant-datasources/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-datasources/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-inventories - version: 1.1.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/inventories/v1beta - service_config: merchantapi_v1beta.yaml - - path: google/shopping/merchant/inventories/v1 - service_config: merchantapi_v1.yaml - source_roots: - - packages/google-shopping-merchant-inventories - preserve_regex: - - packages/google-shopping-merchant-inventories/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-inventories/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-issueresolution - version: 1.1.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/issueresolution/v1 - service_config: merchantapi_v1.yaml - - path: google/shopping/merchant/issueresolution/v1beta - service_config: merchantapi_v1beta.yaml - source_roots: - - packages/google-shopping-merchant-issueresolution - preserve_regex: - - packages/google-shopping-merchant-issueresolution/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-issueresolution/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-lfp - version: 1.1.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/lfp/v1beta - service_config: merchantapi_v1beta.yaml - - path: google/shopping/merchant/lfp/v1 - service_config: merchantapi_v1.yaml - source_roots: - - packages/google-shopping-merchant-lfp - preserve_regex: - - packages/google-shopping-merchant-lfp/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-lfp/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-notifications - version: 1.1.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/notifications/v1 - service_config: merchantapi_v1.yaml - - path: google/shopping/merchant/notifications/v1beta - service_config: merchantapi_v1beta.yaml - source_roots: - - packages/google-shopping-merchant-notifications - preserve_regex: - - packages/google-shopping-merchant-notifications/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-notifications/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-ordertracking - version: 1.1.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/ordertracking/v1 - service_config: merchantapi_v1.yaml - - path: google/shopping/merchant/ordertracking/v1beta - service_config: merchantapi_v1beta.yaml - source_roots: - - packages/google-shopping-merchant-ordertracking - preserve_regex: - - packages/google-shopping-merchant-ordertracking/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-ordertracking/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-products - version: 1.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/products/v1 - service_config: merchantapi_v1.yaml - - path: google/shopping/merchant/products/v1beta - service_config: merchantapi_v1beta.yaml - source_roots: - - packages/google-shopping-merchant-products - preserve_regex: - - packages/google-shopping-merchant-products/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-products/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-productstudio - version: 0.2.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/productstudio/v1alpha - service_config: merchantapi_v1alpha.yaml - source_roots: - - packages/google-shopping-merchant-productstudio - preserve_regex: - - packages/google-shopping-merchant-productstudio/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-productstudio/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-promotions - version: 1.1.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/promotions/v1 - service_config: merchantapi_v1.yaml - - path: google/shopping/merchant/promotions/v1beta - service_config: merchantapi_v1beta.yaml - source_roots: - - packages/google-shopping-merchant-promotions - preserve_regex: - - packages/google-shopping-merchant-promotions/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-promotions/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-quota - version: 1.1.0 - last_generated_commit: c2db528a3e4d12b95666c719ee0db30a3d4c78ad - apis: - - path: google/shopping/merchant/quota/v1beta - service_config: merchantapi_v1beta.yaml - - path: google/shopping/merchant/quota/v1 - service_config: merchantapi_v1.yaml - source_roots: - - packages/google-shopping-merchant-quota - preserve_regex: - - packages/google-shopping-merchant-quota/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-quota/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-reports - version: 1.1.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/reports/v1beta - service_config: merchantapi_v1beta.yaml - - path: google/shopping/merchant/reports/v1 - service_config: merchantapi_v1.yaml - - path: google/shopping/merchant/reports/v1alpha - service_config: merchantapi_v1alpha.yaml - source_roots: - - packages/google-shopping-merchant-reports - preserve_regex: - - packages/google-shopping-merchant-reports/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-reports/ - tag_format: '{id}-v{version}' - - id: google-shopping-merchant-reviews - version: 0.3.0 - last_generated_commit: 3322511885371d2b2253f209ccc3aa60d4100cfd - apis: - - path: google/shopping/merchant/reviews/v1beta - service_config: merchantapi_v1beta.yaml - source_roots: - - packages/google-shopping-merchant-reviews - preserve_regex: - - packages/google-shopping-merchant-reviews/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - remove_regex: - - packages/google-shopping-merchant-reviews/ - tag_format: '{id}-v{version}' - - id: google-shopping-type - version: 1.1.0 - last_generated_commit: a17b84add8318f780fcc8a027815d5fee644b9f7 - apis: - - path: google/shopping/type - service_config: "" - source_roots: - - packages/google-shopping-type - preserve_regex: - - packages/google-shopping-type/CHANGELOG.md - - docs/CHANGELOG.md - - samples/README.txt - - samples/snippets/README.rst - - tests/system - - tests/unit/gapic/type/test_type.py - remove_regex: - - packages/google-shopping-type/ - tag_format: '{id}-v{version}' - - id: googleapis-common-protos - version: 1.72.0 - last_generated_commit: c9ff4f1cd26f1fe63e6d1c11a198366b70ebdb84 - apis: - - path: google/api - service_config: serviceconfig.yaml - - path: google/cloud - service_config: "" - - path: google/cloud/location - service_config: cloud.yaml - - path: google/logging/type - service_config: "" - - path: google/rpc - service_config: rpc_publish.yaml - - path: google/rpc/context - service_config: "" - - path: google/type - service_config: type.yaml - source_roots: - - packages/googleapis-common-protos - preserve_regex: [] - remove_regex: - - ^packages/googleapis-common-protos/google/(?:api|cloud|logging|rpc|type)/.*(?:\.proto|_pb2\.(?:py|pyi))$ - - .repo-metadata.json - - README.rst - - docs/summary_overview.md - tag_format: '{id}-v{version}' - - id: grafeas - version: 1.16.0 - last_generated_commit: e8365a7f88fabe8717cb8322b8ce784b03b6daea + - id: google-cloud-discoveryengine + version: 0.15.0 + last_generated_commit: c288189b43c016dd3cf1ec73ce3cadee8b732f07 apis: - - path: grafeas/v1 - service_config: grafeas_v1.yaml + - path: google/cloud/discoveryengine/v1 + service_config: discoveryengine_v1.yaml + - path: google/cloud/discoveryengine/v1beta + service_config: discoveryengine_v1beta.yaml + - path: google/cloud/discoveryengine/v1alpha + service_config: discoveryengine_v1alpha.yaml source_roots: - - packages/grafeas + - packages/google-cloud-discoveryengine preserve_regex: - - packages/grafeas/CHANGELOG.md + - packages/google-cloud-discoveryengine/CHANGELOG.md - docs/CHANGELOG.md - samples/README.txt - samples/snippets/README.rst - tests/system - - grafeas/grafeas\.py - - ^packages/grafeas/grafeas/__init__.py - - grafeas/grafeas/grafeas_v1/types.py remove_regex: - - packages/grafeas - tag_format: '{id}-v{version}' - - id: grpc-google-iam-v1 - version: 0.14.2 - last_generated_commit: e8365a7f88fabe8717cb8322b8ce784b03b6daea - apis: - - path: google/iam/v1 - service_config: iam_meta_api.yaml - source_roots: - - packages/grpc-google-iam-v1/ - preserve_regex: [] - remove_regex: - - ^packages/grpc-google-iam-v1/google/iam/v1/[^/]*(?:\.proto|_pb2\.(?:py|pyi))$ - - .repo-metadata.json - - README.rst - - docs/summary_overview.md - tag_format: '{id}-v{version}' + - packages/google-cloud-discoveryengine/ + tag_format: '{id}-v{version}' \ No newline at end of file diff --git a/packages/google-cloud-discoveryengine/docs/conf.py b/packages/google-cloud-discoveryengine/docs/conf.py index cd739b891f18..4c7eb31ab3e6 100644 --- a/packages/google-cloud-discoveryengine/docs/conf.py +++ b/packages/google-cloud-discoveryengine/docs/conf.py @@ -25,9 +25,9 @@ # All configuration values have a default; values that are commented out # serve to show the default. +import sys import os import shlex -import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/__init__.py index 87c60a3ca4fc..e745ae2feb51 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/__init__.py @@ -18,202 +18,258 @@ __version__ = package_version.__version__ -from google.cloud.discoveryengine_v1beta.services.completion_service.async_client import ( - CompletionServiceAsyncClient, -) from google.cloud.discoveryengine_v1beta.services.completion_service.client import ( CompletionServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.control_service.async_client import ( - ControlServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.completion_service.async_client import ( + CompletionServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.control_service.client import ( ControlServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.conversational_search_service.async_client import ( - ConversationalSearchServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.control_service.async_client import ( + ControlServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.conversational_search_service.client import ( ConversationalSearchServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.data_store_service.async_client import ( - DataStoreServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.conversational_search_service.async_client import ( + ConversationalSearchServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.data_store_service.client import ( DataStoreServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.document_service.async_client import ( - DocumentServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.data_store_service.async_client import ( + DataStoreServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.document_service.client import ( DocumentServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.engine_service.async_client import ( - EngineServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.document_service.async_client import ( + DocumentServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.engine_service.client import ( EngineServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.evaluation_service.async_client import ( - EvaluationServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.engine_service.async_client import ( + EngineServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.evaluation_service.client import ( EvaluationServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.grounded_generation_service.async_client import ( - GroundedGenerationServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.evaluation_service.async_client import ( + EvaluationServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.grounded_generation_service.client import ( GroundedGenerationServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.project_service.async_client import ( - ProjectServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.grounded_generation_service.async_client import ( + GroundedGenerationServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.project_service.client import ( ProjectServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.rank_service.async_client import ( - RankServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.project_service.async_client import ( + ProjectServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.rank_service.client import ( RankServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.recommendation_service.async_client import ( - RecommendationServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.rank_service.async_client import ( + RankServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.recommendation_service.client import ( RecommendationServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.sample_query_service.async_client import ( - SampleQueryServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.recommendation_service.async_client import ( + RecommendationServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.sample_query_service.client import ( SampleQueryServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.sample_query_set_service.async_client import ( - SampleQuerySetServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.sample_query_service.async_client import ( + SampleQueryServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.sample_query_set_service.client import ( SampleQuerySetServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.schema_service.async_client import ( - SchemaServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.sample_query_set_service.async_client import ( + SampleQuerySetServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.schema_service.client import ( SchemaServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.search_service.async_client import ( - SearchServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.schema_service.async_client import ( + SchemaServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.search_service.client import ( SearchServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.search_tuning_service.async_client import ( - SearchTuningServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.search_service.async_client import ( + SearchServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.search_tuning_service.client import ( SearchTuningServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.serving_config_service.async_client import ( - ServingConfigServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.search_tuning_service.async_client import ( + SearchTuningServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.serving_config_service.client import ( ServingConfigServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.session_service.async_client import ( - SessionServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.serving_config_service.async_client import ( + ServingConfigServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.session_service.client import ( SessionServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.site_search_engine_service.async_client import ( - SiteSearchEngineServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.session_service.async_client import ( + SessionServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.site_search_engine_service.client import ( SiteSearchEngineServiceClient, ) -from google.cloud.discoveryengine_v1beta.services.user_event_service.async_client import ( - UserEventServiceAsyncClient, +from google.cloud.discoveryengine_v1beta.services.site_search_engine_service.async_client import ( + SiteSearchEngineServiceAsyncClient, ) from google.cloud.discoveryengine_v1beta.services.user_event_service.client import ( UserEventServiceClient, ) +from google.cloud.discoveryengine_v1beta.services.user_event_service.async_client import ( + UserEventServiceAsyncClient, +) + from google.cloud.discoveryengine_v1beta.types.answer import Answer from google.cloud.discoveryengine_v1beta.types.chunk import Chunk -from google.cloud.discoveryengine_v1beta.types.common import ( - CustomAttribute, - DoubleList, - EmbeddingConfig, - IndustryVertical, - Interval, - SearchAddOn, - SearchTier, - SearchUseCase, - SolutionType, - UserInfo, -) -from google.cloud.discoveryengine_v1beta.types.completion import ( - CompletionSuggestion, - SuggestionDenyListEntry, -) +from google.cloud.discoveryengine_v1beta.types.common import CustomAttribute +from google.cloud.discoveryengine_v1beta.types.common import DoubleList +from google.cloud.discoveryengine_v1beta.types.common import EmbeddingConfig +from google.cloud.discoveryengine_v1beta.types.common import Interval +from google.cloud.discoveryengine_v1beta.types.common import UserInfo +from google.cloud.discoveryengine_v1beta.types.common import IndustryVertical +from google.cloud.discoveryengine_v1beta.types.common import SearchAddOn +from google.cloud.discoveryengine_v1beta.types.common import SearchTier +from google.cloud.discoveryengine_v1beta.types.common import SearchUseCase +from google.cloud.discoveryengine_v1beta.types.common import SolutionType +from google.cloud.discoveryengine_v1beta.types.completion import CompletionSuggestion +from google.cloud.discoveryengine_v1beta.types.completion import SuggestionDenyListEntry from google.cloud.discoveryengine_v1beta.types.completion_service import ( AdvancedCompleteQueryRequest, +) +from google.cloud.discoveryengine_v1beta.types.completion_service import ( AdvancedCompleteQueryResponse, +) +from google.cloud.discoveryengine_v1beta.types.completion_service import ( CompleteQueryRequest, +) +from google.cloud.discoveryengine_v1beta.types.completion_service import ( CompleteQueryResponse, ) -from google.cloud.discoveryengine_v1beta.types.control import Condition, Control +from google.cloud.discoveryengine_v1beta.types.control import Condition +from google.cloud.discoveryengine_v1beta.types.control import Control from google.cloud.discoveryengine_v1beta.types.control_service import ( CreateControlRequest, +) +from google.cloud.discoveryengine_v1beta.types.control_service import ( DeleteControlRequest, - GetControlRequest, +) +from google.cloud.discoveryengine_v1beta.types.control_service import GetControlRequest +from google.cloud.discoveryengine_v1beta.types.control_service import ( ListControlsRequest, +) +from google.cloud.discoveryengine_v1beta.types.control_service import ( ListControlsResponse, - UpdateControlRequest, ) -from google.cloud.discoveryengine_v1beta.types.conversation import ( - Conversation, - ConversationContext, - ConversationMessage, - Reply, - TextInput, +from google.cloud.discoveryengine_v1beta.types.control_service import ( + UpdateControlRequest, ) +from google.cloud.discoveryengine_v1beta.types.conversation import Conversation +from google.cloud.discoveryengine_v1beta.types.conversation import ConversationContext +from google.cloud.discoveryengine_v1beta.types.conversation import ConversationMessage +from google.cloud.discoveryengine_v1beta.types.conversation import Reply +from google.cloud.discoveryengine_v1beta.types.conversation import TextInput from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( AnswerQueryRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( AnswerQueryResponse, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( ConverseConversationRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( ConverseConversationResponse, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( CreateConversationRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( CreateSessionRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( DeleteConversationRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( DeleteSessionRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( GetAnswerRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( GetConversationRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( GetSessionRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( ListConversationsRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( ListConversationsResponse, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( ListSessionsRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( ListSessionsResponse, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( UpdateConversationRequest, +) +from google.cloud.discoveryengine_v1beta.types.conversational_search_service import ( UpdateSessionRequest, ) from google.cloud.discoveryengine_v1beta.types.custom_tuning_model import ( CustomTuningModel, ) +from google.cloud.discoveryengine_v1beta.types.data_store import DataStore +from google.cloud.discoveryengine_v1beta.types.data_store import LanguageInfo from google.cloud.discoveryengine_v1beta.types.data_store import ( - DataStore, - LanguageInfo, NaturalLanguageQueryUnderstandingConfig, - WorkspaceConfig, ) +from google.cloud.discoveryengine_v1beta.types.data_store import WorkspaceConfig from google.cloud.discoveryengine_v1beta.types.data_store_service import ( CreateDataStoreMetadata, +) +from google.cloud.discoveryengine_v1beta.types.data_store_service import ( CreateDataStoreRequest, +) +from google.cloud.discoveryengine_v1beta.types.data_store_service import ( DeleteDataStoreMetadata, +) +from google.cloud.discoveryengine_v1beta.types.data_store_service import ( DeleteDataStoreRequest, +) +from google.cloud.discoveryengine_v1beta.types.data_store_service import ( GetDataStoreRequest, +) +from google.cloud.discoveryengine_v1beta.types.data_store_service import ( ListDataStoresRequest, +) +from google.cloud.discoveryengine_v1beta.types.data_store_service import ( ListDataStoresResponse, +) +from google.cloud.discoveryengine_v1beta.types.data_store_service import ( UpdateDataStoreRequest, ) from google.cloud.discoveryengine_v1beta.types.document import Document @@ -222,214 +278,401 @@ ) from google.cloud.discoveryengine_v1beta.types.document_service import ( BatchGetDocumentsMetadataRequest, +) +from google.cloud.discoveryengine_v1beta.types.document_service import ( BatchGetDocumentsMetadataResponse, +) +from google.cloud.discoveryengine_v1beta.types.document_service import ( CreateDocumentRequest, +) +from google.cloud.discoveryengine_v1beta.types.document_service import ( DeleteDocumentRequest, +) +from google.cloud.discoveryengine_v1beta.types.document_service import ( GetDocumentRequest, +) +from google.cloud.discoveryengine_v1beta.types.document_service import ( ListDocumentsRequest, +) +from google.cloud.discoveryengine_v1beta.types.document_service import ( ListDocumentsResponse, +) +from google.cloud.discoveryengine_v1beta.types.document_service import ( UpdateDocumentRequest, ) from google.cloud.discoveryengine_v1beta.types.engine import Engine from google.cloud.discoveryengine_v1beta.types.engine_service import ( CreateEngineMetadata, - CreateEngineRequest, +) +from google.cloud.discoveryengine_v1beta.types.engine_service import CreateEngineRequest +from google.cloud.discoveryengine_v1beta.types.engine_service import ( DeleteEngineMetadata, - DeleteEngineRequest, - GetEngineRequest, - ListEnginesRequest, - ListEnginesResponse, - PauseEngineRequest, - ResumeEngineRequest, - TuneEngineMetadata, - TuneEngineRequest, - TuneEngineResponse, - UpdateEngineRequest, -) -from google.cloud.discoveryengine_v1beta.types.evaluation import ( - Evaluation, - QualityMetrics, ) +from google.cloud.discoveryengine_v1beta.types.engine_service import DeleteEngineRequest +from google.cloud.discoveryengine_v1beta.types.engine_service import GetEngineRequest +from google.cloud.discoveryengine_v1beta.types.engine_service import ListEnginesRequest +from google.cloud.discoveryengine_v1beta.types.engine_service import ListEnginesResponse +from google.cloud.discoveryengine_v1beta.types.engine_service import PauseEngineRequest +from google.cloud.discoveryengine_v1beta.types.engine_service import ResumeEngineRequest +from google.cloud.discoveryengine_v1beta.types.engine_service import TuneEngineMetadata +from google.cloud.discoveryengine_v1beta.types.engine_service import TuneEngineRequest +from google.cloud.discoveryengine_v1beta.types.engine_service import TuneEngineResponse +from google.cloud.discoveryengine_v1beta.types.engine_service import UpdateEngineRequest +from google.cloud.discoveryengine_v1beta.types.evaluation import Evaluation +from google.cloud.discoveryengine_v1beta.types.evaluation import QualityMetrics from google.cloud.discoveryengine_v1beta.types.evaluation_service import ( CreateEvaluationMetadata, +) +from google.cloud.discoveryengine_v1beta.types.evaluation_service import ( CreateEvaluationRequest, +) +from google.cloud.discoveryengine_v1beta.types.evaluation_service import ( GetEvaluationRequest, +) +from google.cloud.discoveryengine_v1beta.types.evaluation_service import ( ListEvaluationResultsRequest, +) +from google.cloud.discoveryengine_v1beta.types.evaluation_service import ( ListEvaluationResultsResponse, +) +from google.cloud.discoveryengine_v1beta.types.evaluation_service import ( ListEvaluationsRequest, +) +from google.cloud.discoveryengine_v1beta.types.evaluation_service import ( ListEvaluationsResponse, ) from google.cloud.discoveryengine_v1beta.types.grounded_generation_service import ( CheckGroundingRequest, +) +from google.cloud.discoveryengine_v1beta.types.grounded_generation_service import ( CheckGroundingResponse, +) +from google.cloud.discoveryengine_v1beta.types.grounded_generation_service import ( CheckGroundingSpec, +) +from google.cloud.discoveryengine_v1beta.types.grounded_generation_service import ( GenerateGroundedContentRequest, +) +from google.cloud.discoveryengine_v1beta.types.grounded_generation_service import ( GenerateGroundedContentResponse, - GroundedGenerationContent, ) -from google.cloud.discoveryengine_v1beta.types.grounding import ( - FactChunk, - GroundingConfig, - GroundingFact, +from google.cloud.discoveryengine_v1beta.types.grounded_generation_service import ( + GroundedGenerationContent, ) +from google.cloud.discoveryengine_v1beta.types.grounding import FactChunk +from google.cloud.discoveryengine_v1beta.types.grounding import GroundingConfig +from google.cloud.discoveryengine_v1beta.types.grounding import GroundingFact +from google.cloud.discoveryengine_v1beta.types.import_config import AlloyDbSource +from google.cloud.discoveryengine_v1beta.types.import_config import BigQuerySource +from google.cloud.discoveryengine_v1beta.types.import_config import BigtableOptions +from google.cloud.discoveryengine_v1beta.types.import_config import BigtableSource +from google.cloud.discoveryengine_v1beta.types.import_config import CloudSqlSource +from google.cloud.discoveryengine_v1beta.types.import_config import FhirStoreSource +from google.cloud.discoveryengine_v1beta.types.import_config import FirestoreSource +from google.cloud.discoveryengine_v1beta.types.import_config import GcsSource from google.cloud.discoveryengine_v1beta.types.import_config import ( - AlloyDbSource, - BigQuerySource, - BigtableOptions, - BigtableSource, - CloudSqlSource, - FhirStoreSource, - FirestoreSource, - GcsSource, ImportCompletionSuggestionsMetadata, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportCompletionSuggestionsRequest, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportCompletionSuggestionsResponse, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportDocumentsMetadata, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportDocumentsRequest, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportDocumentsResponse, - ImportErrorConfig, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ImportErrorConfig +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportSampleQueriesMetadata, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportSampleQueriesRequest, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportSampleQueriesResponse, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportSuggestionDenyListEntriesMetadata, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportSuggestionDenyListEntriesRequest, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportSuggestionDenyListEntriesResponse, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportUserEventsMetadata, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportUserEventsRequest, +) +from google.cloud.discoveryengine_v1beta.types.import_config import ( ImportUserEventsResponse, - SpannerSource, ) +from google.cloud.discoveryengine_v1beta.types.import_config import SpannerSource from google.cloud.discoveryengine_v1beta.types.project import Project from google.cloud.discoveryengine_v1beta.types.project_service import ( ProvisionProjectMetadata, +) +from google.cloud.discoveryengine_v1beta.types.project_service import ( ProvisionProjectRequest, ) from google.cloud.discoveryengine_v1beta.types.purge_config import ( PurgeCompletionSuggestionsMetadata, +) +from google.cloud.discoveryengine_v1beta.types.purge_config import ( PurgeCompletionSuggestionsRequest, +) +from google.cloud.discoveryengine_v1beta.types.purge_config import ( PurgeCompletionSuggestionsResponse, +) +from google.cloud.discoveryengine_v1beta.types.purge_config import ( PurgeDocumentsMetadata, - PurgeDocumentsRequest, +) +from google.cloud.discoveryengine_v1beta.types.purge_config import PurgeDocumentsRequest +from google.cloud.discoveryengine_v1beta.types.purge_config import ( PurgeDocumentsResponse, - PurgeErrorConfig, +) +from google.cloud.discoveryengine_v1beta.types.purge_config import PurgeErrorConfig +from google.cloud.discoveryengine_v1beta.types.purge_config import ( PurgeSuggestionDenyListEntriesMetadata, +) +from google.cloud.discoveryengine_v1beta.types.purge_config import ( PurgeSuggestionDenyListEntriesRequest, +) +from google.cloud.discoveryengine_v1beta.types.purge_config import ( PurgeSuggestionDenyListEntriesResponse, +) +from google.cloud.discoveryengine_v1beta.types.purge_config import ( PurgeUserEventsMetadata, +) +from google.cloud.discoveryengine_v1beta.types.purge_config import ( PurgeUserEventsRequest, - PurgeUserEventsResponse, ) -from google.cloud.discoveryengine_v1beta.types.rank_service import ( - RankingRecord, - RankRequest, - RankResponse, +from google.cloud.discoveryengine_v1beta.types.purge_config import ( + PurgeUserEventsResponse, ) +from google.cloud.discoveryengine_v1beta.types.rank_service import RankingRecord +from google.cloud.discoveryengine_v1beta.types.rank_service import RankRequest +from google.cloud.discoveryengine_v1beta.types.rank_service import RankResponse from google.cloud.discoveryengine_v1beta.types.recommendation_service import ( RecommendRequest, +) +from google.cloud.discoveryengine_v1beta.types.recommendation_service import ( RecommendResponse, ) from google.cloud.discoveryengine_v1beta.types.sample_query import SampleQuery from google.cloud.discoveryengine_v1beta.types.sample_query_service import ( CreateSampleQueryRequest, +) +from google.cloud.discoveryengine_v1beta.types.sample_query_service import ( DeleteSampleQueryRequest, +) +from google.cloud.discoveryengine_v1beta.types.sample_query_service import ( GetSampleQueryRequest, +) +from google.cloud.discoveryengine_v1beta.types.sample_query_service import ( ListSampleQueriesRequest, +) +from google.cloud.discoveryengine_v1beta.types.sample_query_service import ( ListSampleQueriesResponse, +) +from google.cloud.discoveryengine_v1beta.types.sample_query_service import ( UpdateSampleQueryRequest, ) from google.cloud.discoveryengine_v1beta.types.sample_query_set import SampleQuerySet from google.cloud.discoveryengine_v1beta.types.sample_query_set_service import ( CreateSampleQuerySetRequest, +) +from google.cloud.discoveryengine_v1beta.types.sample_query_set_service import ( DeleteSampleQuerySetRequest, +) +from google.cloud.discoveryengine_v1beta.types.sample_query_set_service import ( GetSampleQuerySetRequest, +) +from google.cloud.discoveryengine_v1beta.types.sample_query_set_service import ( ListSampleQuerySetsRequest, +) +from google.cloud.discoveryengine_v1beta.types.sample_query_set_service import ( ListSampleQuerySetsResponse, +) +from google.cloud.discoveryengine_v1beta.types.sample_query_set_service import ( UpdateSampleQuerySetRequest, ) from google.cloud.discoveryengine_v1beta.types.schema import Schema from google.cloud.discoveryengine_v1beta.types.schema_service import ( CreateSchemaMetadata, - CreateSchemaRequest, +) +from google.cloud.discoveryengine_v1beta.types.schema_service import CreateSchemaRequest +from google.cloud.discoveryengine_v1beta.types.schema_service import ( DeleteSchemaMetadata, - DeleteSchemaRequest, - GetSchemaRequest, - ListSchemasRequest, - ListSchemasResponse, - UpdateSchemaMetadata, - UpdateSchemaRequest, ) -from google.cloud.discoveryengine_v1beta.types.search_service import ( - SearchRequest, - SearchResponse, +from google.cloud.discoveryengine_v1beta.types.schema_service import DeleteSchemaRequest +from google.cloud.discoveryengine_v1beta.types.schema_service import GetSchemaRequest +from google.cloud.discoveryengine_v1beta.types.schema_service import ListSchemasRequest +from google.cloud.discoveryengine_v1beta.types.schema_service import ListSchemasResponse +from google.cloud.discoveryengine_v1beta.types.schema_service import ( + UpdateSchemaMetadata, ) +from google.cloud.discoveryengine_v1beta.types.schema_service import UpdateSchemaRequest +from google.cloud.discoveryengine_v1beta.types.search_service import SearchRequest +from google.cloud.discoveryengine_v1beta.types.search_service import SearchResponse from google.cloud.discoveryengine_v1beta.types.search_tuning_service import ( ListCustomModelsRequest, +) +from google.cloud.discoveryengine_v1beta.types.search_tuning_service import ( ListCustomModelsResponse, +) +from google.cloud.discoveryengine_v1beta.types.search_tuning_service import ( TrainCustomModelMetadata, +) +from google.cloud.discoveryengine_v1beta.types.search_tuning_service import ( TrainCustomModelRequest, +) +from google.cloud.discoveryengine_v1beta.types.search_tuning_service import ( TrainCustomModelResponse, ) from google.cloud.discoveryengine_v1beta.types.serving_config import ServingConfig from google.cloud.discoveryengine_v1beta.types.serving_config_service import ( GetServingConfigRequest, +) +from google.cloud.discoveryengine_v1beta.types.serving_config_service import ( ListServingConfigsRequest, +) +from google.cloud.discoveryengine_v1beta.types.serving_config_service import ( ListServingConfigsResponse, +) +from google.cloud.discoveryengine_v1beta.types.serving_config_service import ( UpdateServingConfigRequest, ) -from google.cloud.discoveryengine_v1beta.types.session import Query, Session +from google.cloud.discoveryengine_v1beta.types.session import Query +from google.cloud.discoveryengine_v1beta.types.session import Session +from google.cloud.discoveryengine_v1beta.types.site_search_engine import Sitemap from google.cloud.discoveryengine_v1beta.types.site_search_engine import ( - Sitemap, SiteSearchEngine, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine import ( SiteVerificationInfo, - TargetSite, ) +from google.cloud.discoveryengine_v1beta.types.site_search_engine import TargetSite from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( BatchCreateTargetSiteMetadata, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( BatchCreateTargetSitesRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( BatchCreateTargetSitesResponse, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( BatchVerifyTargetSitesMetadata, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( BatchVerifyTargetSitesRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( BatchVerifyTargetSitesResponse, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( CreateSitemapMetadata, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( CreateSitemapRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( CreateTargetSiteMetadata, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( CreateTargetSiteRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( DeleteSitemapMetadata, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( DeleteSitemapRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( DeleteTargetSiteMetadata, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( DeleteTargetSiteRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( DisableAdvancedSiteSearchMetadata, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( DisableAdvancedSiteSearchRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( DisableAdvancedSiteSearchResponse, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( EnableAdvancedSiteSearchMetadata, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( EnableAdvancedSiteSearchRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( EnableAdvancedSiteSearchResponse, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( FetchDomainVerificationStatusRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( FetchDomainVerificationStatusResponse, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( FetchSitemapsRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( FetchSitemapsResponse, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( GetSiteSearchEngineRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( GetTargetSiteRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( ListTargetSitesRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( ListTargetSitesResponse, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( RecrawlUrisMetadata, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( RecrawlUrisRequest, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( RecrawlUrisResponse, +) +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( UpdateTargetSiteMetadata, - UpdateTargetSiteRequest, ) -from google.cloud.discoveryengine_v1beta.types.user_event import ( - CompletionInfo, - DocumentInfo, - MediaInfo, - PageInfo, - PanelInfo, - SearchInfo, - TransactionInfo, - UserEvent, +from google.cloud.discoveryengine_v1beta.types.site_search_engine_service import ( + UpdateTargetSiteRequest, ) +from google.cloud.discoveryengine_v1beta.types.user_event import CompletionInfo +from google.cloud.discoveryengine_v1beta.types.user_event import DocumentInfo +from google.cloud.discoveryengine_v1beta.types.user_event import MediaInfo +from google.cloud.discoveryengine_v1beta.types.user_event import PageInfo +from google.cloud.discoveryengine_v1beta.types.user_event import PanelInfo +from google.cloud.discoveryengine_v1beta.types.user_event import SearchInfo +from google.cloud.discoveryengine_v1beta.types.user_event import TransactionInfo +from google.cloud.discoveryengine_v1beta.types.user_event import UserEvent from google.cloud.discoveryengine_v1beta.types.user_event_service import ( CollectUserEventRequest, +) +from google.cloud.discoveryengine_v1beta.types.user_event_service import ( WriteUserEventRequest, ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/gapic_version.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/gapic_version.py index 6b356a66811e..fd79d4e761b7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/gapic_version.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.15.0" # {x-release-please-version} +__version__ = "0.4.0" # {x-release-please-version} diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py index 178101cff40d..c66b8b0b1b8a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/__init__.py @@ -18,327 +18,289 @@ __version__ = package_version.__version__ -from .services.assistant_service import ( - AssistantServiceAsyncClient, - AssistantServiceClient, -) -from .services.cmek_config_service import ( - CmekConfigServiceAsyncClient, - CmekConfigServiceClient, -) -from .services.completion_service import ( - CompletionServiceAsyncClient, - CompletionServiceClient, -) -from .services.control_service import ControlServiceAsyncClient, ControlServiceClient +from .services.assistant_service import AssistantServiceClient +from .services.assistant_service import AssistantServiceAsyncClient +from .services.cmek_config_service import CmekConfigServiceClient +from .services.cmek_config_service import CmekConfigServiceAsyncClient +from .services.completion_service import CompletionServiceClient +from .services.completion_service import CompletionServiceAsyncClient +from .services.control_service import ControlServiceClient +from .services.control_service import ControlServiceAsyncClient +from .services.conversational_search_service import ConversationalSearchServiceClient from .services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, - ConversationalSearchServiceClient, -) -from .services.data_store_service import ( - DataStoreServiceAsyncClient, - DataStoreServiceClient, -) -from .services.document_service import DocumentServiceAsyncClient, DocumentServiceClient -from .services.engine_service import EngineServiceAsyncClient, EngineServiceClient -from .services.grounded_generation_service import ( - GroundedGenerationServiceAsyncClient, - GroundedGenerationServiceClient, ) +from .services.data_store_service import DataStoreServiceClient +from .services.data_store_service import DataStoreServiceAsyncClient +from .services.document_service import DocumentServiceClient +from .services.document_service import DocumentServiceAsyncClient +from .services.engine_service import EngineServiceClient +from .services.engine_service import EngineServiceAsyncClient +from .services.grounded_generation_service import GroundedGenerationServiceClient +from .services.grounded_generation_service import GroundedGenerationServiceAsyncClient +from .services.identity_mapping_store_service import IdentityMappingStoreServiceClient from .services.identity_mapping_store_service import ( IdentityMappingStoreServiceAsyncClient, - IdentityMappingStoreServiceClient, -) -from .services.project_service import ProjectServiceAsyncClient, ProjectServiceClient -from .services.rank_service import RankServiceAsyncClient, RankServiceClient -from .services.recommendation_service import ( - RecommendationServiceAsyncClient, - RecommendationServiceClient, -) -from .services.schema_service import SchemaServiceAsyncClient, SchemaServiceClient -from .services.search_service import SearchServiceAsyncClient, SearchServiceClient -from .services.search_tuning_service import ( - SearchTuningServiceAsyncClient, - SearchTuningServiceClient, -) -from .services.serving_config_service import ( - ServingConfigServiceAsyncClient, - ServingConfigServiceClient, -) -from .services.session_service import SessionServiceAsyncClient, SessionServiceClient -from .services.site_search_engine_service import ( - SiteSearchEngineServiceAsyncClient, - SiteSearchEngineServiceClient, -) -from .services.user_event_service import ( - UserEventServiceAsyncClient, - UserEventServiceClient, -) -from .services.user_license_service import ( - UserLicenseServiceAsyncClient, - UserLicenseServiceClient, ) +from .services.project_service import ProjectServiceClient +from .services.project_service import ProjectServiceAsyncClient +from .services.rank_service import RankServiceClient +from .services.rank_service import RankServiceAsyncClient +from .services.recommendation_service import RecommendationServiceClient +from .services.recommendation_service import RecommendationServiceAsyncClient +from .services.schema_service import SchemaServiceClient +from .services.schema_service import SchemaServiceAsyncClient +from .services.search_service import SearchServiceClient +from .services.search_service import SearchServiceAsyncClient +from .services.search_tuning_service import SearchTuningServiceClient +from .services.search_tuning_service import SearchTuningServiceAsyncClient +from .services.serving_config_service import ServingConfigServiceClient +from .services.serving_config_service import ServingConfigServiceAsyncClient +from .services.session_service import SessionServiceClient +from .services.session_service import SessionServiceAsyncClient +from .services.site_search_engine_service import SiteSearchEngineServiceClient +from .services.site_search_engine_service import SiteSearchEngineServiceAsyncClient +from .services.user_event_service import UserEventServiceClient +from .services.user_event_service import UserEventServiceAsyncClient +from .services.user_license_service import UserLicenseServiceClient +from .services.user_license_service import UserLicenseServiceAsyncClient + from .types.answer import Answer -from .types.assist_answer import ( - AssistAnswer, - AssistantContent, - AssistantGroundedContent, -) +from .types.assist_answer import AssistAnswer +from .types.assist_answer import AssistantContent +from .types.assist_answer import AssistantGroundedContent from .types.assistant import Assistant -from .types.assistant_service import ( - AssistUserMetadata, - StreamAssistRequest, - StreamAssistResponse, -) +from .types.assistant_service import AssistUserMetadata +from .types.assistant_service import StreamAssistRequest +from .types.assistant_service import StreamAssistResponse from .types.chunk import Chunk -from .types.cmek_config_service import ( - CmekConfig, - DeleteCmekConfigMetadata, - DeleteCmekConfigRequest, - GetCmekConfigRequest, - ListCmekConfigsRequest, - ListCmekConfigsResponse, - SingleRegionKey, - UpdateCmekConfigMetadata, - UpdateCmekConfigRequest, -) -from .types.common import ( - CustomAttribute, - DoubleList, - HealthcareFhirConfig, - IndustryVertical, - Interval, - Principal, - SearchAddOn, - SearchLinkPromotion, - SearchTier, - SearchUseCase, - SolutionType, - UserInfo, -) -from .types.completion import CompletionSuggestion, SuggestionDenyListEntry -from .types.completion_service import CompleteQueryRequest, CompleteQueryResponse -from .types.control import Condition, Control -from .types.control_service import ( - CreateControlRequest, - DeleteControlRequest, - GetControlRequest, - ListControlsRequest, - ListControlsResponse, - UpdateControlRequest, -) -from .types.conversation import ( - Conversation, - ConversationContext, - ConversationMessage, - Reply, - TextInput, -) -from .types.conversational_search_service import ( - AnswerQueryRequest, - AnswerQueryResponse, - ConverseConversationRequest, - ConverseConversationResponse, - CreateConversationRequest, - CreateSessionRequest, - DeleteConversationRequest, - DeleteSessionRequest, - GetAnswerRequest, - GetConversationRequest, - GetSessionRequest, - ListConversationsRequest, - ListConversationsResponse, - ListSessionsRequest, - ListSessionsResponse, - UpdateConversationRequest, - UpdateSessionRequest, -) +from .types.cmek_config_service import CmekConfig +from .types.cmek_config_service import DeleteCmekConfigMetadata +from .types.cmek_config_service import DeleteCmekConfigRequest +from .types.cmek_config_service import GetCmekConfigRequest +from .types.cmek_config_service import ListCmekConfigsRequest +from .types.cmek_config_service import ListCmekConfigsResponse +from .types.cmek_config_service import SingleRegionKey +from .types.cmek_config_service import UpdateCmekConfigMetadata +from .types.cmek_config_service import UpdateCmekConfigRequest +from .types.common import CustomAttribute +from .types.common import DoubleList +from .types.common import HealthcareFhirConfig +from .types.common import Interval +from .types.common import Principal +from .types.common import SearchLinkPromotion +from .types.common import UserInfo +from .types.common import IndustryVertical +from .types.common import SearchAddOn +from .types.common import SearchTier +from .types.common import SearchUseCase +from .types.common import SolutionType +from .types.completion import CompletionSuggestion +from .types.completion import SuggestionDenyListEntry +from .types.completion_service import CompleteQueryRequest +from .types.completion_service import CompleteQueryResponse +from .types.control import Condition +from .types.control import Control +from .types.control_service import CreateControlRequest +from .types.control_service import DeleteControlRequest +from .types.control_service import GetControlRequest +from .types.control_service import ListControlsRequest +from .types.control_service import ListControlsResponse +from .types.control_service import UpdateControlRequest +from .types.conversation import Conversation +from .types.conversation import ConversationContext +from .types.conversation import ConversationMessage +from .types.conversation import Reply +from .types.conversation import TextInput +from .types.conversational_search_service import AnswerQueryRequest +from .types.conversational_search_service import AnswerQueryResponse +from .types.conversational_search_service import ConverseConversationRequest +from .types.conversational_search_service import ConverseConversationResponse +from .types.conversational_search_service import CreateConversationRequest +from .types.conversational_search_service import CreateSessionRequest +from .types.conversational_search_service import DeleteConversationRequest +from .types.conversational_search_service import DeleteSessionRequest +from .types.conversational_search_service import GetAnswerRequest +from .types.conversational_search_service import GetConversationRequest +from .types.conversational_search_service import GetSessionRequest +from .types.conversational_search_service import ListConversationsRequest +from .types.conversational_search_service import ListConversationsResponse +from .types.conversational_search_service import ListSessionsRequest +from .types.conversational_search_service import ListSessionsResponse +from .types.conversational_search_service import UpdateConversationRequest +from .types.conversational_search_service import UpdateSessionRequest from .types.custom_tuning_model import CustomTuningModel -from .types.data_store import AdvancedSiteSearchConfig, DataStore, WorkspaceConfig -from .types.data_store_service import ( - CreateDataStoreMetadata, - CreateDataStoreRequest, - DeleteDataStoreMetadata, - DeleteDataStoreRequest, - GetDataStoreRequest, - ListDataStoresRequest, - ListDataStoresResponse, - UpdateDataStoreRequest, -) +from .types.data_store import AdvancedSiteSearchConfig +from .types.data_store import DataStore +from .types.data_store import WorkspaceConfig +from .types.data_store_service import CreateDataStoreMetadata +from .types.data_store_service import CreateDataStoreRequest +from .types.data_store_service import DeleteDataStoreMetadata +from .types.data_store_service import DeleteDataStoreRequest +from .types.data_store_service import GetDataStoreRequest +from .types.data_store_service import ListDataStoresRequest +from .types.data_store_service import ListDataStoresResponse +from .types.data_store_service import UpdateDataStoreRequest from .types.document import Document from .types.document_processing_config import DocumentProcessingConfig -from .types.document_service import ( - BatchGetDocumentsMetadataRequest, - BatchGetDocumentsMetadataResponse, - CreateDocumentRequest, - DeleteDocumentRequest, - GetDocumentRequest, - ListDocumentsRequest, - ListDocumentsResponse, - UpdateDocumentRequest, -) +from .types.document_service import BatchGetDocumentsMetadataRequest +from .types.document_service import BatchGetDocumentsMetadataResponse +from .types.document_service import CreateDocumentRequest +from .types.document_service import DeleteDocumentRequest +from .types.document_service import GetDocumentRequest +from .types.document_service import ListDocumentsRequest +from .types.document_service import ListDocumentsResponse +from .types.document_service import UpdateDocumentRequest from .types.engine import Engine -from .types.engine_service import ( - CreateEngineMetadata, - CreateEngineRequest, - DeleteEngineMetadata, - DeleteEngineRequest, - GetEngineRequest, - ListEnginesRequest, - ListEnginesResponse, - UpdateEngineRequest, -) -from .types.grounded_generation_service import ( - CheckGroundingRequest, - CheckGroundingResponse, - CheckGroundingSpec, - GenerateGroundedContentRequest, - GenerateGroundedContentResponse, - GroundedGenerationContent, -) -from .types.grounding import FactChunk, GroundingFact -from .types.identity_mapping_store import IdentityMappingEntry, IdentityMappingStore -from .types.identity_mapping_store_service import ( - CreateIdentityMappingStoreRequest, - DeleteIdentityMappingStoreMetadata, - DeleteIdentityMappingStoreRequest, - GetIdentityMappingStoreRequest, - IdentityMappingEntryOperationMetadata, - ImportIdentityMappingsRequest, - ImportIdentityMappingsResponse, - ListIdentityMappingsRequest, - ListIdentityMappingsResponse, - ListIdentityMappingStoresRequest, - ListIdentityMappingStoresResponse, - PurgeIdentityMappingsRequest, -) -from .types.import_config import ( - AlloyDbSource, - BigQuerySource, - BigtableOptions, - BigtableSource, - CloudSqlSource, - FhirStoreSource, - FirestoreSource, - GcsSource, - ImportCompletionSuggestionsMetadata, - ImportCompletionSuggestionsRequest, - ImportCompletionSuggestionsResponse, - ImportDocumentsMetadata, - ImportDocumentsRequest, - ImportDocumentsResponse, - ImportErrorConfig, - ImportSuggestionDenyListEntriesMetadata, - ImportSuggestionDenyListEntriesRequest, - ImportSuggestionDenyListEntriesResponse, - ImportUserEventsMetadata, - ImportUserEventsRequest, - ImportUserEventsResponse, - SpannerSource, -) +from .types.engine_service import CreateEngineMetadata +from .types.engine_service import CreateEngineRequest +from .types.engine_service import DeleteEngineMetadata +from .types.engine_service import DeleteEngineRequest +from .types.engine_service import GetEngineRequest +from .types.engine_service import ListEnginesRequest +from .types.engine_service import ListEnginesResponse +from .types.engine_service import UpdateEngineRequest +from .types.grounded_generation_service import CheckGroundingRequest +from .types.grounded_generation_service import CheckGroundingResponse +from .types.grounded_generation_service import CheckGroundingSpec +from .types.grounded_generation_service import GenerateGroundedContentRequest +from .types.grounded_generation_service import GenerateGroundedContentResponse +from .types.grounded_generation_service import GroundedGenerationContent +from .types.grounding import FactChunk +from .types.grounding import GroundingFact +from .types.identity_mapping_store import IdentityMappingEntry +from .types.identity_mapping_store import IdentityMappingStore +from .types.identity_mapping_store_service import CreateIdentityMappingStoreRequest +from .types.identity_mapping_store_service import DeleteIdentityMappingStoreMetadata +from .types.identity_mapping_store_service import DeleteIdentityMappingStoreRequest +from .types.identity_mapping_store_service import GetIdentityMappingStoreRequest +from .types.identity_mapping_store_service import IdentityMappingEntryOperationMetadata +from .types.identity_mapping_store_service import ImportIdentityMappingsRequest +from .types.identity_mapping_store_service import ImportIdentityMappingsResponse +from .types.identity_mapping_store_service import ListIdentityMappingsRequest +from .types.identity_mapping_store_service import ListIdentityMappingsResponse +from .types.identity_mapping_store_service import ListIdentityMappingStoresRequest +from .types.identity_mapping_store_service import ListIdentityMappingStoresResponse +from .types.identity_mapping_store_service import PurgeIdentityMappingsRequest +from .types.import_config import AlloyDbSource +from .types.import_config import BigQuerySource +from .types.import_config import BigtableOptions +from .types.import_config import BigtableSource +from .types.import_config import CloudSqlSource +from .types.import_config import FhirStoreSource +from .types.import_config import FirestoreSource +from .types.import_config import GcsSource +from .types.import_config import ImportCompletionSuggestionsMetadata +from .types.import_config import ImportCompletionSuggestionsRequest +from .types.import_config import ImportCompletionSuggestionsResponse +from .types.import_config import ImportDocumentsMetadata +from .types.import_config import ImportDocumentsRequest +from .types.import_config import ImportDocumentsResponse +from .types.import_config import ImportErrorConfig +from .types.import_config import ImportSuggestionDenyListEntriesMetadata +from .types.import_config import ImportSuggestionDenyListEntriesRequest +from .types.import_config import ImportSuggestionDenyListEntriesResponse +from .types.import_config import ImportUserEventsMetadata +from .types.import_config import ImportUserEventsRequest +from .types.import_config import ImportUserEventsResponse +from .types.import_config import SpannerSource from .types.project import Project -from .types.project_service import ProvisionProjectMetadata, ProvisionProjectRequest -from .types.purge_config import ( - PurgeCompletionSuggestionsMetadata, - PurgeCompletionSuggestionsRequest, - PurgeCompletionSuggestionsResponse, - PurgeDocumentsMetadata, - PurgeDocumentsRequest, - PurgeDocumentsResponse, - PurgeErrorConfig, - PurgeSuggestionDenyListEntriesMetadata, - PurgeSuggestionDenyListEntriesRequest, - PurgeSuggestionDenyListEntriesResponse, - PurgeUserEventsMetadata, - PurgeUserEventsRequest, - PurgeUserEventsResponse, -) -from .types.rank_service import RankingRecord, RankRequest, RankResponse -from .types.recommendation_service import RecommendRequest, RecommendResponse -from .types.safety import HarmCategory, SafetyRating +from .types.project_service import ProvisionProjectMetadata +from .types.project_service import ProvisionProjectRequest +from .types.purge_config import PurgeCompletionSuggestionsMetadata +from .types.purge_config import PurgeCompletionSuggestionsRequest +from .types.purge_config import PurgeCompletionSuggestionsResponse +from .types.purge_config import PurgeDocumentsMetadata +from .types.purge_config import PurgeDocumentsRequest +from .types.purge_config import PurgeDocumentsResponse +from .types.purge_config import PurgeErrorConfig +from .types.purge_config import PurgeSuggestionDenyListEntriesMetadata +from .types.purge_config import PurgeSuggestionDenyListEntriesRequest +from .types.purge_config import PurgeSuggestionDenyListEntriesResponse +from .types.purge_config import PurgeUserEventsMetadata +from .types.purge_config import PurgeUserEventsRequest +from .types.purge_config import PurgeUserEventsResponse +from .types.rank_service import RankingRecord +from .types.rank_service import RankRequest +from .types.rank_service import RankResponse +from .types.recommendation_service import RecommendRequest +from .types.recommendation_service import RecommendResponse +from .types.safety import SafetyRating +from .types.safety import HarmCategory from .types.schema import Schema -from .types.schema_service import ( - CreateSchemaMetadata, - CreateSchemaRequest, - DeleteSchemaMetadata, - DeleteSchemaRequest, - GetSchemaRequest, - ListSchemasRequest, - ListSchemasResponse, - UpdateSchemaMetadata, - UpdateSchemaRequest, -) -from .types.search_service import SearchRequest, SearchResponse -from .types.search_tuning_service import ( - ListCustomModelsRequest, - ListCustomModelsResponse, - TrainCustomModelMetadata, - TrainCustomModelRequest, - TrainCustomModelResponse, -) +from .types.schema_service import CreateSchemaMetadata +from .types.schema_service import CreateSchemaRequest +from .types.schema_service import DeleteSchemaMetadata +from .types.schema_service import DeleteSchemaRequest +from .types.schema_service import GetSchemaRequest +from .types.schema_service import ListSchemasRequest +from .types.schema_service import ListSchemasResponse +from .types.schema_service import UpdateSchemaMetadata +from .types.schema_service import UpdateSchemaRequest +from .types.search_service import SearchRequest +from .types.search_service import SearchResponse +from .types.search_tuning_service import ListCustomModelsRequest +from .types.search_tuning_service import ListCustomModelsResponse +from .types.search_tuning_service import TrainCustomModelMetadata +from .types.search_tuning_service import TrainCustomModelRequest +from .types.search_tuning_service import TrainCustomModelResponse from .types.serving_config import ServingConfig from .types.serving_config_service import UpdateServingConfigRequest -from .types.session import Query, Session -from .types.site_search_engine import ( - Sitemap, - SiteSearchEngine, - SiteVerificationInfo, - TargetSite, -) -from .types.site_search_engine_service import ( - BatchCreateTargetSiteMetadata, - BatchCreateTargetSitesRequest, - BatchCreateTargetSitesResponse, - BatchVerifyTargetSitesMetadata, - BatchVerifyTargetSitesRequest, - BatchVerifyTargetSitesResponse, - CreateSitemapMetadata, - CreateSitemapRequest, - CreateTargetSiteMetadata, - CreateTargetSiteRequest, - DeleteSitemapMetadata, - DeleteSitemapRequest, - DeleteTargetSiteMetadata, - DeleteTargetSiteRequest, - DisableAdvancedSiteSearchMetadata, - DisableAdvancedSiteSearchRequest, - DisableAdvancedSiteSearchResponse, - EnableAdvancedSiteSearchMetadata, - EnableAdvancedSiteSearchRequest, - EnableAdvancedSiteSearchResponse, - FetchDomainVerificationStatusRequest, - FetchDomainVerificationStatusResponse, - FetchSitemapsRequest, - FetchSitemapsResponse, - GetSiteSearchEngineRequest, - GetTargetSiteRequest, - ListTargetSitesRequest, - ListTargetSitesResponse, - RecrawlUrisMetadata, - RecrawlUrisRequest, - RecrawlUrisResponse, - UpdateTargetSiteMetadata, - UpdateTargetSiteRequest, -) -from .types.user_event import ( - CompletionInfo, - DocumentInfo, - MediaInfo, - PageInfo, - PanelInfo, - SearchInfo, - TransactionInfo, - UserEvent, -) -from .types.user_event_service import CollectUserEventRequest, WriteUserEventRequest +from .types.session import Query +from .types.session import Session +from .types.site_search_engine import Sitemap +from .types.site_search_engine import SiteSearchEngine +from .types.site_search_engine import SiteVerificationInfo +from .types.site_search_engine import TargetSite +from .types.site_search_engine_service import BatchCreateTargetSiteMetadata +from .types.site_search_engine_service import BatchCreateTargetSitesRequest +from .types.site_search_engine_service import BatchCreateTargetSitesResponse +from .types.site_search_engine_service import BatchVerifyTargetSitesMetadata +from .types.site_search_engine_service import BatchVerifyTargetSitesRequest +from .types.site_search_engine_service import BatchVerifyTargetSitesResponse +from .types.site_search_engine_service import CreateSitemapMetadata +from .types.site_search_engine_service import CreateSitemapRequest +from .types.site_search_engine_service import CreateTargetSiteMetadata +from .types.site_search_engine_service import CreateTargetSiteRequest +from .types.site_search_engine_service import DeleteSitemapMetadata +from .types.site_search_engine_service import DeleteSitemapRequest +from .types.site_search_engine_service import DeleteTargetSiteMetadata +from .types.site_search_engine_service import DeleteTargetSiteRequest +from .types.site_search_engine_service import DisableAdvancedSiteSearchMetadata +from .types.site_search_engine_service import DisableAdvancedSiteSearchRequest +from .types.site_search_engine_service import DisableAdvancedSiteSearchResponse +from .types.site_search_engine_service import EnableAdvancedSiteSearchMetadata +from .types.site_search_engine_service import EnableAdvancedSiteSearchRequest +from .types.site_search_engine_service import EnableAdvancedSiteSearchResponse +from .types.site_search_engine_service import FetchDomainVerificationStatusRequest +from .types.site_search_engine_service import FetchDomainVerificationStatusResponse +from .types.site_search_engine_service import FetchSitemapsRequest +from .types.site_search_engine_service import FetchSitemapsResponse +from .types.site_search_engine_service import GetSiteSearchEngineRequest +from .types.site_search_engine_service import GetTargetSiteRequest +from .types.site_search_engine_service import ListTargetSitesRequest +from .types.site_search_engine_service import ListTargetSitesResponse +from .types.site_search_engine_service import RecrawlUrisMetadata +from .types.site_search_engine_service import RecrawlUrisRequest +from .types.site_search_engine_service import RecrawlUrisResponse +from .types.site_search_engine_service import UpdateTargetSiteMetadata +from .types.site_search_engine_service import UpdateTargetSiteRequest +from .types.user_event import CompletionInfo +from .types.user_event import DocumentInfo +from .types.user_event import MediaInfo +from .types.user_event import PageInfo +from .types.user_event import PanelInfo +from .types.user_event import SearchInfo +from .types.user_event import TransactionInfo +from .types.user_event import UserEvent +from .types.user_event_service import CollectUserEventRequest +from .types.user_event_service import WriteUserEventRequest from .types.user_license import UserLicense -from .types.user_license_service import ( - BatchUpdateUserLicensesMetadata, - BatchUpdateUserLicensesRequest, - BatchUpdateUserLicensesResponse, - ListUserLicensesRequest, - ListUserLicensesResponse, -) +from .types.user_license_service import BatchUpdateUserLicensesMetadata +from .types.user_license_service import BatchUpdateUserLicensesRequest +from .types.user_license_service import BatchUpdateUserLicensesResponse +from .types.user_license_service import ListUserLicensesRequest +from .types.user_license_service import ListUserLicensesResponse __all__ = ( "AssistantServiceAsyncClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/gapic_version.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/gapic_version.py index 6b356a66811e..fd79d4e761b7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/gapic_version.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.15.0" # {x-release-please-version} +__version__ = "0.4.0" # {x-release-please-version} diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/__init__.py index 61e8f333fb58..1ca07e3a5a45 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import AssistantServiceAsyncClient from .client import AssistantServiceClient +from .async_client import AssistantServiceAsyncClient __all__ = ( "AssistantServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py index 53976232bc61..446cf3e907e7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/async_client.py @@ -13,47 +13,47 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - AsyncIterable, - Awaitable, - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, Optional, + AsyncIterable, + Awaitable, Sequence, Tuple, Type, Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1.types import assist_answer +from google.cloud.discoveryengine_v1.types import assistant_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import assist_answer, assistant_service - -from .client import AssistantServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, AssistantServiceTransport +from .transports.base import AssistantServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import AssistantServiceGrpcAsyncIOTransport +from .client import AssistantServiceClient try: from google.api_core import client_logging # type: ignore @@ -129,7 +129,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AssistantServiceAsyncClient: The constructed client. """ - return AssistantServiceClient.from_service_account_info.__func__(AssistantServiceAsyncClient, info, *args, **kwargs) # type: ignore + return AssistantServiceClient.from_service_account_info.__func__( + AssistantServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +147,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AssistantServiceAsyncClient: The constructed client. """ - return AssistantServiceClient.from_service_account_file.__func__(AssistantServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return AssistantServiceClient.from_service_account_file.__func__( + AssistantServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py index be979d2572c3..db577f001e96 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/client.py @@ -20,13 +20,13 @@ import os import re from typing import ( - Callable, Dict, - Iterable, + Callable, Mapping, MutableMapping, MutableSequence, Optional, + Iterable, Sequence, Tuple, Type, @@ -35,19 +35,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -62,12 +62,11 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1.types import assist_answer +from google.cloud.discoveryengine_v1.types import assistant_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import assist_answer, assistant_service - -from .transports.base import DEFAULT_CLIENT_INFO, AssistantServiceTransport +from .transports.base import AssistantServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import AssistantServiceGrpcTransport from .transports.grpc_asyncio import AssistantServiceGrpcAsyncIOTransport from .transports.rest import AssistantServiceRestTransport @@ -81,9 +80,7 @@ class AssistantServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AssistantServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AssistantServiceTransport]] _transport_registry["grpc"] = AssistantServiceGrpcTransport _transport_registry["grpc_asyncio"] = AssistantServiceGrpcAsyncIOTransport _transport_registry["rest"] = AssistantServiceRestTransport @@ -713,11 +710,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AssistantServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AssistantServiceClient._read_environment_variables() + ) self._client_cert_source = AssistantServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -752,8 +747,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AssistantServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/__init__.py index 090a905984ae..6df23173990e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import AssistantServiceTransport from .grpc import AssistantServiceGrpcTransport from .grpc_asyncio import AssistantServiceGrpcAsyncIOTransport -from .rest import AssistantServiceRestInterceptor, AssistantServiceRestTransport +from .rest import AssistantServiceRestTransport +from .rest import AssistantServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[AssistantServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py index 31a7cf2f8929..aab9ffe2e8b3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import assistant_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -211,7 +212,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py index c4694cb3571e..ef82bde486a7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import assistant_service - -from .base import DEFAULT_CLIENT_INFO, AssistantServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import AssistantServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py index b356fdf333fa..a5607e0c2d53 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import assistant_service - -from .base import DEFAULT_CLIENT_INFO, AssistantServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import AssistantServiceTransport, DEFAULT_CLIENT_INFO from .grpc import AssistantServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py index 49ba60e14f26..44e13dce9864 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import assistant_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAssistantServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -516,9 +522,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAssistantServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAssistantServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -778,9 +782,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAssistantServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAssistantServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAssistantServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest_base.py index df20db51d6a2..9420ca3e3f51 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/assistant_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import AssistantServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import assistant_service - -from .base import DEFAULT_CLIENT_INFO, AssistantServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseAssistantServiceRestTransport(AssistantServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/__init__.py index 863e84cf9d00..51fc80582075 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import CmekConfigServiceAsyncClient from .client import CmekConfigServiceClient +from .async_client import CmekConfigServiceAsyncClient __all__ = ( "CmekConfigServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py index a5e23bae15a0..ced8fdf79ac0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,15 +47,13 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.types import cmek_config_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import cmek_config_service - -from .client import CmekConfigServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, CmekConfigServiceTransport +from .transports.base import CmekConfigServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import CmekConfigServiceGrpcAsyncIOTransport +from .client import CmekConfigServiceClient try: from google.api_core import client_logging # type: ignore @@ -132,7 +131,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CmekConfigServiceAsyncClient: The constructed client. """ - return CmekConfigServiceClient.from_service_account_info.__func__(CmekConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + return CmekConfigServiceClient.from_service_account_info.__func__( + CmekConfigServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +149,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CmekConfigServiceAsyncClient: The constructed client. """ - return CmekConfigServiceClient.from_service_account_file.__func__(CmekConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return CmekConfigServiceClient.from_service_account_file.__func__( + CmekConfigServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py index aa8828198418..2d5890ee1601 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,13 +63,11 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.types import cmek_config_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import cmek_config_service - -from .transports.base import DEFAULT_CLIENT_INFO, CmekConfigServiceTransport +from .transports.base import CmekConfigServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import CmekConfigServiceGrpcTransport from .transports.grpc_asyncio import CmekConfigServiceGrpcAsyncIOTransport from .transports.rest import CmekConfigServiceRestTransport @@ -83,9 +81,7 @@ class CmekConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CmekConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CmekConfigServiceTransport]] _transport_registry["grpc"] = CmekConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = CmekConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = CmekConfigServiceRestTransport @@ -675,11 +671,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CmekConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CmekConfigServiceClient._read_environment_variables() + ) self._client_cert_source = CmekConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -714,8 +708,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CmekConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/__init__.py index 66bc7b16ebf0..805d19299df4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import CmekConfigServiceTransport from .grpc import CmekConfigServiceGrpcTransport from .grpc_asyncio import CmekConfigServiceGrpcAsyncIOTransport -from .rest import CmekConfigServiceRestInterceptor, CmekConfigServiceRestTransport +from .rest import CmekConfigServiceRestTransport +from .rest import CmekConfigServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[CmekConfigServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py index bf56c1dc0d97..b4acca5ed876 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/base.py @@ -16,19 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import cmek_config_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -251,7 +253,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py index a51541d73d1b..158abfeeaa28 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import cmek_config_service - -from .base import DEFAULT_CLIENT_INFO, CmekConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import CmekConfigServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py index 2e31add97da0..ec7cc049443e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/grpc_asyncio.py @@ -15,27 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import cmek_config_service - -from .base import DEFAULT_CLIENT_INFO, CmekConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import CmekConfigServiceTransport, DEFAULT_CLIENT_INFO from .grpc import CmekConfigServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py index 43ffa1c6f925..feb3648e49ba 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest.py @@ -13,27 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import cmek_config_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseCmekConfigServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -715,9 +722,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseDeleteCmekConfig._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseDeleteCmekConfig._get_http_options() request, metadata = self._interceptor.pre_delete_cmek_config( request, metadata @@ -863,9 +868,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseGetCmekConfig._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseGetCmekConfig._get_http_options() request, metadata = self._interceptor.pre_get_cmek_config(request, metadata) transcoded_request = _BaseCmekConfigServiceRestTransport._BaseGetCmekConfig._get_transcoded_request( @@ -1013,9 +1016,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseListCmekConfigs._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseListCmekConfigs._get_http_options() request, metadata = self._interceptor.pre_list_cmek_configs( request, metadata @@ -1167,9 +1168,7 @@ def __call__( """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseUpdateCmekConfig._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseUpdateCmekConfig._get_http_options() request, metadata = self._interceptor.pre_update_cmek_config( request, metadata @@ -1359,9 +1358,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1481,9 +1478,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCmekConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1622,9 +1617,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCmekConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCmekConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCmekConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest_base.py index 6c9861b2399a..30b332c3f7b8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/cmek_config_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import CmekConfigServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import cmek_config_service - -from .base import DEFAULT_CLIENT_INFO, CmekConfigServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseCmekConfigServiceRestTransport(CmekConfigServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/__init__.py index 58eb7a9f0042..480b61be40da 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import CompletionServiceAsyncClient from .client import CompletionServiceClient +from .async_client import CompletionServiceAsyncClient __all__ = ( "CompletionServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py index 31704e8c8267..3afa6da883bd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,18 +47,14 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.types import completion_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import ( - completion_service, - import_config, - purge_config, -) - -from .client import CompletionServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from .transports.base import CompletionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import CompletionServiceGrpcAsyncIOTransport +from .client import CompletionServiceClient try: from google.api_core import client_logging # type: ignore @@ -121,7 +118,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_info.__func__(CompletionServiceAsyncClient, info, *args, **kwargs) # type: ignore + return CompletionServiceClient.from_service_account_info.__func__( + CompletionServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +136,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_file.__func__(CompletionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return CompletionServiceClient.from_service_account_file.__func__( + CompletionServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py index 142e6da0e1a7..67edaf059e54 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,16 +63,12 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.types import completion_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import ( - completion_service, - import_config, - purge_config, -) - -from .transports.base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from .transports.base import CompletionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import CompletionServiceGrpcTransport from .transports.grpc_asyncio import CompletionServiceGrpcAsyncIOTransport from .transports.rest import CompletionServiceRestTransport @@ -86,9 +82,7 @@ class CompletionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompletionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] _transport_registry["grpc"] = CompletionServiceGrpcTransport _transport_registry["grpc_asyncio"] = CompletionServiceGrpcAsyncIOTransport _transport_registry["rest"] = CompletionServiceRestTransport @@ -614,11 +608,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompletionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompletionServiceClient._read_environment_variables() + ) self._client_cert_source = CompletionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -653,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompletionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/__init__.py index 20f1ed5f3637..7177c73e997f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import CompletionServiceTransport from .grpc import CompletionServiceGrpcTransport from .grpc_asyncio import CompletionServiceGrpcAsyncIOTransport -from .rest import CompletionServiceRestInterceptor, CompletionServiceRestTransport +from .rest import CompletionServiceRestTransport +from .rest import CompletionServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py index 6f8d8a682797..8ee3c58131a9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/base.py @@ -16,23 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import ( - completion_service, - import_config, - purge_config, -) +from google.cloud.discoveryengine_v1.types import completion_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -267,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py index 0901a44674cb..530af8d8b263 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc.py @@ -16,27 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1.types import ( - completion_service, - import_config, - purge_config, -) - -from .base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from google.cloud.discoveryengine_v1.types import completion_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import CompletionServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -398,12 +398,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -431,12 +431,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -463,12 +463,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -495,12 +495,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py index 7ac71da82875..28497bfb7985 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/grpc_asyncio.py @@ -15,31 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1.types import ( - completion_service, - import_config, - purge_config, -) - -from .base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from google.cloud.discoveryengine_v1.types import completion_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import CompletionServiceTransport, DEFAULT_CLIENT_INFO from .grpc import CompletionServiceGrpcTransport try: @@ -407,12 +407,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -441,12 +441,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -474,12 +474,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -507,12 +507,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py index 828892b07ea0..26c4b760542a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest.py @@ -13,31 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1.types import completion_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1.types import ( - completion_service, - import_config, - purge_config, -) -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseCompletionServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -775,9 +780,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_complete_query(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_transcoded_request( @@ -929,9 +932,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_import_completion_suggestions( request, metadata @@ -998,11 +999,10 @@ def __call__( resp = self._interceptor.post_import_completion_suggestions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_completion_suggestions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_completion_suggestions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1091,15 +1091,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_import_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_import_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1163,11 +1160,10 @@ def __call__( resp = self._interceptor.post_import_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1254,9 +1250,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_purge_completion_suggestions( request, metadata @@ -1411,15 +1405,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_purge_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_purge_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1483,11 +1474,10 @@ def __call__( resp = self._interceptor.post_purge_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1531,7 +1521,9 @@ def import_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_suggestion_deny_list_entries( @@ -1541,7 +1533,9 @@ def import_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ImportSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_completion_suggestions( @@ -1551,7 +1545,9 @@ def purge_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_suggestion_deny_list_entries( @@ -1561,7 +1557,9 @@ def purge_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -1619,9 +1617,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1741,9 +1737,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1882,9 +1876,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest_base.py index b2545baa2a4a..69b32c1a9a14 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/completion_service/transports/rest_base.py @@ -14,21 +14,21 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import CompletionServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1.types import ( - completion_service, - import_config, - purge_config, -) +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, CompletionServiceTransport + +from google.cloud.discoveryengine_v1.types import completion_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.longrunning import operations_pb2 # type: ignore class _BaseCompletionServiceRestTransport(CompletionServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/__init__.py index d5bd8f14f952..b0aec3b84b78 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ControlServiceAsyncClient from .client import ControlServiceClient +from .async_client import ControlServiceAsyncClient __all__ = ( "ControlServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py index 6d551e10468e..0cde2c21be70 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,34 +29,33 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.control_service import pagers from google.cloud.discoveryengine_v1.types import common from google.cloud.discoveryengine_v1.types import control from google.cloud.discoveryengine_v1.types import control as gcd_control from google.cloud.discoveryengine_v1.types import control_service - -from .client import ControlServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from .transports.base import ControlServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ControlServiceGrpcAsyncIOTransport +from .client import ControlServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +127,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_info.__func__(ControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ControlServiceClient.from_service_account_info.__func__( + ControlServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_file.__func__(ControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ControlServiceClient.from_service_account_file.__func__( + ControlServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -619,8 +622,8 @@ async def sample_update_control(): [Control][google.cloud.discoveryengine.v1.Control] to update. The following are NOT supported: - - [Control.name][google.cloud.discoveryengine.v1.Control.name] - - [Control.solution_type][google.cloud.discoveryengine.v1.Control.solution_type] + - [Control.name][google.cloud.discoveryengine.v1.Control.name] + - [Control.solution_type][google.cloud.discoveryengine.v1.Control.solution_type] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py index effeb8344b29..405e0fb2ba1c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,17 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.control_service import pagers from google.cloud.discoveryengine_v1.types import common from google.cloud.discoveryengine_v1.types import control from google.cloud.discoveryengine_v1.types import control as gcd_control from google.cloud.discoveryengine_v1.types import control_service - -from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from .transports.base import ControlServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ControlServiceGrpcTransport from .transports.grpc_asyncio import ControlServiceGrpcAsyncIOTransport from .transports.rest import ControlServiceRestTransport @@ -85,9 +83,7 @@ class ControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] _transport_registry["grpc"] = ControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = ControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = ControlServiceRestTransport @@ -663,11 +659,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ControlServiceClient._read_environment_variables() + ) self._client_cert_source = ControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -702,8 +696,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ControlServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1082,8 +1075,8 @@ def sample_update_control(): [Control][google.cloud.discoveryengine.v1.Control] to update. The following are NOT supported: - - [Control.name][google.cloud.discoveryengine.v1.Control.name] - - [Control.solution_type][google.cloud.discoveryengine.v1.Control.solution_type] + - [Control.name][google.cloud.discoveryengine.v1.Control.name] + - [Control.solution_type][google.cloud.discoveryengine.v1.Control.solution_type] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py index 25df6ee7edfc..d5f41faf8f7d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1.types import control, control_service +from google.cloud.discoveryengine_v1.types import control +from google.cloud.discoveryengine_v1.types import control_service class ListControlsPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/__init__.py index 3e0b9c56088b..4c3c6cfd5dbb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import ControlServiceTransport from .grpc import ControlServiceGrpcTransport from .grpc_asyncio import ControlServiceGrpcAsyncIOTransport -from .rest import ControlServiceRestInterceptor, ControlServiceRestTransport +from .rest import ControlServiceRestTransport +from .rest import ControlServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py index ab04ccdaa6be..00591f78678a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/base.py @@ -16,22 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import control from google.cloud.discoveryengine_v1.types import control as gcd_control from google.cloud.discoveryengine_v1.types import control_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -261,7 +262,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py index feee03b815e0..4f302e507630 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc.py @@ -16,26 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import control from google.cloud.discoveryengine_v1.types import control as gcd_control from google.cloud.discoveryengine_v1.types import control_service - -from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ControlServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py index d1cd6f7eca62..a21819c87b10 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/grpc_asyncio.py @@ -15,30 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import control from google.cloud.discoveryengine_v1.types import control as gcd_control from google.cloud.discoveryengine_v1.types import control_service - -from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ControlServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ControlServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py index a25262b30968..d000fa7fccff 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest.py @@ -13,30 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import control from google.cloud.discoveryengine_v1.types import control as gcd_control from google.cloud.discoveryengine_v1.types import control_service +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseControlServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -1295,9 +1301,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py index f8b4a388e297..6e625924cb99 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/control_service/transports/rest_base.py @@ -14,20 +14,22 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ControlServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import control from google.cloud.discoveryengine_v1.types import control as gcd_control from google.cloud.discoveryengine_v1.types import control_service - -from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseControlServiceRestTransport(ControlServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/__init__.py index 733efd06389f..504962bdc81a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ConversationalSearchServiceAsyncClient from .client import ConversationalSearchServiceClient +from .async_client import ConversationalSearchServiceAsyncClient __all__ = ( "ConversationalSearchServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py index f52112df7f9f..4a24e35d37aa 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/async_client.py @@ -13,61 +13,58 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - AsyncIterable, - Awaitable, - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, Optional, + AsyncIterable, + Awaitable, Sequence, Tuple, Type, Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.conversational_search_service import ( pagers, ) -from google.cloud.discoveryengine_v1.types import ( - conversational_search_service, - safety, - search_service, -) -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import answer from google.cloud.discoveryengine_v1.types import conversation +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1.types import conversational_search_service +from google.cloud.discoveryengine_v1.types import safety +from google.cloud.discoveryengine_v1.types import search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session - -from .client import ConversationalSearchServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ConversationalSearchServiceGrpcAsyncIOTransport +from .client import ConversationalSearchServiceClient try: from google.api_core import client_logging # type: ignore @@ -173,7 +170,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_info.__func__(ConversationalSearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ConversationalSearchServiceClient.from_service_account_info.__func__( + ConversationalSearchServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -189,7 +188,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_file.__func__(ConversationalSearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ConversationalSearchServiceClient.from_service_account_file.__func__( + ConversationalSearchServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -227,7 +228,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationalSearchServiceTransport: @@ -776,7 +779,7 @@ async def sample_update_conversation(): [Conversation][google.cloud.discoveryengine.v1.Conversation] to update. The following are NOT supported: - - [Conversation.name][google.cloud.discoveryengine.v1.Conversation.name] + - [Conversation.name][google.cloud.discoveryengine.v1.Conversation.name] If not set or empty, all supported fields are updated. @@ -1690,7 +1693,7 @@ async def sample_update_session(): [Session][google.cloud.discoveryengine.v1.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1.Session.name] + - [Session.name][google.cloud.discoveryengine.v1.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py index 16de9ed07c2a..08cda78e7b1e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/client.py @@ -20,13 +20,13 @@ import os import re from typing import ( - Callable, Dict, - Iterable, + Callable, Mapping, MutableMapping, MutableSequence, Optional, + Iterable, Sequence, Tuple, Type, @@ -35,19 +35,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -62,26 +62,22 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.conversational_search_service import ( pagers, ) -from google.cloud.discoveryengine_v1.types import ( - conversational_search_service, - safety, - search_service, -) -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import answer from google.cloud.discoveryengine_v1.types import conversation +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1.types import conversational_search_service +from google.cloud.discoveryengine_v1.types import safety +from google.cloud.discoveryengine_v1.types import search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session - -from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ConversationalSearchServiceGrpcTransport from .transports.grpc_asyncio import ConversationalSearchServiceGrpcAsyncIOTransport from .transports.rest import ConversationalSearchServiceRestTransport @@ -95,13 +91,11 @@ class ConversationalSearchServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationalSearchServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ConversationalSearchServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ConversationalSearchServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ConversationalSearchServiceRestTransport def get_transport_class( @@ -809,11 +803,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationalSearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationalSearchServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConversationalSearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -850,8 +842,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationalSearchServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1338,7 +1329,7 @@ def sample_update_conversation(): [Conversation][google.cloud.discoveryengine.v1.Conversation] to update. The following are NOT supported: - - [Conversation.name][google.cloud.discoveryengine.v1.Conversation.name] + - [Conversation.name][google.cloud.discoveryengine.v1.Conversation.name] If not set or empty, all supported fields are updated. @@ -2230,7 +2221,7 @@ def sample_update_session(): [Session][google.cloud.discoveryengine.v1.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1.Session.name] + - [Session.name][google.cloud.discoveryengine.v1.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py index 896deb696acc..31f7892ff7e2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,11 +37,9 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1.types import ( - conversation, - conversational_search_service, - session, -) +from google.cloud.discoveryengine_v1.types import conversation +from google.cloud.discoveryengine_v1.types import conversational_search_service +from google.cloud.discoveryengine_v1.types import session class ListConversationsPager: @@ -71,7 +68,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py index 855e35aad0c0..88c3053fe65f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import ConversationalSearchServiceTransport from .grpc import ConversationalSearchServiceGrpcTransport from .grpc_asyncio import ConversationalSearchServiceGrpcAsyncIOTransport -from .rest import ( - ConversationalSearchServiceRestInterceptor, - ConversationalSearchServiceRestTransport, -) +from .rest import ConversationalSearchServiceRestTransport +from .rest import ConversationalSearchServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationalSearchServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConversationalSearchServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConversationalSearchServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py index 3bdef53e836d..b3ca423d7134 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/base.py @@ -16,25 +16,26 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import answer from google.cloud.discoveryengine_v1.types import conversation +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -402,7 +403,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py index 87669a1bde2d..e055df1eebfa 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc.py @@ -16,29 +16,30 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import answer from google.cloud.discoveryengine_v1.types import conversation +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py index 5b47516e8e9e..c7a1165ce75a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/grpc_asyncio.py @@ -15,33 +15,34 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import answer from google.cloud.discoveryengine_v1.types import conversation +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ConversationalSearchServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py index ea6e8130b173..ebb83b65aa97 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest.py @@ -13,33 +13,39 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import answer from google.cloud.discoveryengine_v1.types import conversation +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationalSearchServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -1036,9 +1042,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_answer_query(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_transcoded_request( @@ -1198,9 +1202,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() request, metadata = self._interceptor.pre_converse_conversation( request, metadata @@ -1358,9 +1360,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1511,9 +1511,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_transcoded_request( @@ -1660,9 +1658,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1769,9 +1765,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_transcoded_request( @@ -1882,9 +1876,7 @@ def __call__( Defines an answer. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() request, metadata = self._interceptor.pre_get_answer(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_transcoded_request( @@ -2031,9 +2023,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -2180,9 +2170,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() request, metadata = self._interceptor.pre_get_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_transcoded_request( @@ -2329,9 +2317,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2480,9 +2466,7 @@ def __call__( Response for ListSessions method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_transcoded_request( @@ -2638,9 +2622,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseStreamAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseStreamAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_stream_answer_query( request, metadata @@ -2788,9 +2770,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -2941,9 +2921,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() request, metadata = self._interceptor.pre_update_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_transcoded_request( @@ -3238,9 +3216,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3363,9 +3339,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3506,9 +3480,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py index 4094e99450f5..605c83b7912f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/conversational_search_service/transports/rest_base.py @@ -14,23 +14,25 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import answer from google.cloud.discoveryengine_v1.types import conversation +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseConversationalSearchServiceRestTransport( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/__init__.py index aaea8b56ac8a..b8c5d59ab4e4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import DataStoreServiceAsyncClient from .client import DataStoreServiceClient +from .async_client import DataStoreServiceAsyncClient __all__ = ( "DataStoreServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py index 3dc9595013f9..a5032cbfcf5c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,25 +47,22 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.services.data_store_service import pagers +from google.cloud.discoveryengine_v1.types import cmek_config_service +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1.types import data_store_service +from google.cloud.discoveryengine_v1.types import document_processing_config +from google.cloud.discoveryengine_v1.types import schema from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.services.data_store_service import pagers -from google.cloud.discoveryengine_v1.types import ( - data_store_service, - document_processing_config, - schema, -) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import data_store -from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store - -from .client import DataStoreServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from .transports.base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import DataStoreServiceGrpcAsyncIOTransport +from .client import DataStoreServiceClient try: from google.api_core import client_logging # type: ignore @@ -157,7 +155,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_info.__func__(DataStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + return DataStoreServiceClient.from_service_account_info.__func__( + DataStoreServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -173,7 +173,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_file.__func__(DataStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return DataStoreServiceClient.from_service_account_file.__func__( + DataStoreServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py index 0339b982d45a..6c98fd08f707 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,23 +63,20 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.services.data_store_service import pagers +from google.cloud.discoveryengine_v1.types import cmek_config_service +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1.types import data_store_service +from google.cloud.discoveryengine_v1.types import document_processing_config +from google.cloud.discoveryengine_v1.types import schema from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.services.data_store_service import pagers -from google.cloud.discoveryengine_v1.types import ( - data_store_service, - document_processing_config, - schema, -) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import data_store -from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store - -from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from .transports.base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import DataStoreServiceGrpcTransport from .transports.grpc_asyncio import DataStoreServiceGrpcAsyncIOTransport from .transports.rest import DataStoreServiceRestTransport @@ -93,9 +90,7 @@ class DataStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] _transport_registry["grpc"] = DataStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataStoreServiceRestTransport @@ -783,11 +778,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataStoreServiceClient._read_environment_variables() + ) self._client_cert_source = DataStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -822,8 +815,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py index 7f58cc992a6b..c0c6ff9b40ab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1.types import data_store, data_store_service +from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store_service class ListDataStoresPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/__init__.py index 70a5571eccbe..9230588b12ff 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import DataStoreServiceTransport from .grpc import DataStoreServiceGrpcTransport from .grpc_asyncio import DataStoreServiceGrpcAsyncIOTransport -from .rest import DataStoreServiceRestInterceptor, DataStoreServiceRestTransport +from .rest import DataStoreServiceRestTransport +from .rest import DataStoreServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py index 0704969371b3..fbafe9ac49fd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/base.py @@ -16,21 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1.types import data_store_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -265,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py index 1912e521bbea..f5a266837a9c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1.types import data_store_service - -from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py index 28891d658dc4..52aa475e320a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/grpc_asyncio.py @@ -15,29 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1.types import data_store_service - -from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO from .grpc import DataStoreServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py index 39d47ff88a08..31fdaf571587 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest.py @@ -13,29 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1.types import data_store_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataStoreServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -776,9 +783,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() request, metadata = self._interceptor.pre_create_data_store( request, metadata @@ -931,9 +936,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() request, metadata = self._interceptor.pre_delete_data_store( request, metadata @@ -1228,9 +1231,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() request, metadata = self._interceptor.pre_list_data_stores( request, metadata @@ -1382,9 +1383,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() request, metadata = self._interceptor.pre_update_data_store( request, metadata @@ -1584,9 +1583,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1846,9 +1843,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py index acd1629b2ef9..94f9bf4a1ded 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/data_store_service/transports/rest_base.py @@ -14,19 +14,21 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import data_store from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1.types import data_store_service - -from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseDataStoreServiceRestTransport(DataStoreServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/__init__.py index 0bd096115c9e..4d6f3ee464d0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import DocumentServiceAsyncClient from .client import DocumentServiceClient +from .async_client import DocumentServiceAsyncClient __all__ = ( "DocumentServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py index 71054e73c44d..7916ea22304d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,24 +47,20 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.services.document_service import pagers +from google.cloud.discoveryengine_v1.types import document +from google.cloud.discoveryengine_v1.types import document as gcd_document +from google.cloud.discoveryengine_v1.types import document_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.services.document_service import pagers -from google.cloud.discoveryengine_v1.types import ( - document_service, - import_config, - purge_config, -) -from google.cloud.discoveryengine_v1.types import document -from google.cloud.discoveryengine_v1.types import document as gcd_document - -from .client import DocumentServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from .transports.base import DocumentServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import DocumentServiceGrpcAsyncIOTransport +from .client import DocumentServiceClient try: from google.api_core import client_logging # type: ignore @@ -138,7 +135,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + return DocumentServiceClient.from_service_account_info.__func__( + DocumentServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +153,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return DocumentServiceClient.from_service_account_file.__func__( + DocumentServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py index 1b4043d931d9..b947e4057e5c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,22 +63,18 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.services.document_service import pagers +from google.cloud.discoveryengine_v1.types import document +from google.cloud.discoveryengine_v1.types import document as gcd_document +from google.cloud.discoveryengine_v1.types import document_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.services.document_service import pagers -from google.cloud.discoveryengine_v1.types import ( - document_service, - import_config, - purge_config, -) -from google.cloud.discoveryengine_v1.types import document -from google.cloud.discoveryengine_v1.types import document as gcd_document - -from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from .transports.base import DocumentServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import DocumentServiceGrpcTransport from .transports.grpc_asyncio import DocumentServiceGrpcAsyncIOTransport from .transports.rest import DocumentServiceRestTransport @@ -92,9 +88,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -701,11 +695,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -740,8 +732,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py index ac51440eeead..056821610376 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1.types import document, document_service +from google.cloud.discoveryengine_v1.types import document +from google.cloud.discoveryengine_v1.types import document_service class ListDocumentsPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/__init__.py index 08578a95ea6d..de821c2b2022 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import DocumentServiceTransport from .grpc import DocumentServiceGrpcTransport from .grpc_asyncio import DocumentServiceGrpcAsyncIOTransport -from .rest import DocumentServiceRestInterceptor, DocumentServiceRestTransport +from .rest import DocumentServiceRestTransport +from .rest import DocumentServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py index 82c50be788d0..2b7c35df1608 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/base.py @@ -16,26 +16,26 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document +from google.cloud.discoveryengine_v1.types import document_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -324,7 +324,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py index 05e0a2d3f1d3..e8f46ecdeee8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc.py @@ -16,30 +16,30 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document - -from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from google.cloud.discoveryengine_v1.types import document_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import DocumentServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -582,12 +582,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py index 77f762d0e1d3..17e5c33a6bc2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/grpc_asyncio.py @@ -15,34 +15,34 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document - -from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from google.cloud.discoveryengine_v1.types import document_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import DocumentServiceTransport, DEFAULT_CLIENT_INFO from .grpc import DocumentServiceGrpcTransport try: @@ -599,12 +599,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py index 50a4d46dde6f..f40e3f2d6b56 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest.py @@ -13,34 +13,39 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + -from google.cloud.discoveryengine_v1.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document +from google.cloud.discoveryengine_v1.types import document_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -908,9 +913,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() request, metadata = self._interceptor.pre_batch_get_documents_metadata( request, metadata @@ -1066,9 +1069,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -1213,9 +1214,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -1476,9 +1475,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1782,9 +1779,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() request, metadata = self._interceptor.pre_purge_documents(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_transcoded_request( @@ -1935,9 +1930,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -2039,7 +2032,9 @@ def batch_get_documents_metadata( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchGetDocumentsMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetDocumentsMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_document( @@ -2154,9 +2149,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2416,9 +2409,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py index 46c67990ec00..e979e7cbf238 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/document_service/transports/rest_base.py @@ -14,24 +14,24 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import DocumentServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format -from google.cloud.discoveryengine_v1.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1.types import document from google.cloud.discoveryengine_v1.types import document as gcd_document - -from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from google.cloud.discoveryengine_v1.types import document_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseDocumentServiceRestTransport(DocumentServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/__init__.py index f028860e65ae..e6da99d73e86 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import EngineServiceAsyncClient from .client import EngineServiceClient +from .async_client import EngineServiceAsyncClient __all__ = ( "EngineServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py index 925b30d7dfeb..d6627bc655c4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,21 +47,19 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.engine_service import pagers from google.cloud.discoveryengine_v1.types import common from google.cloud.discoveryengine_v1.types import engine from google.cloud.discoveryengine_v1.types import engine as gcd_engine from google.cloud.discoveryengine_v1.types import engine_service - -from .client import EngineServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import EngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import EngineServiceGrpcAsyncIOTransport +from .client import EngineServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +127,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_info.__func__(EngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + return EngineServiceClient.from_service_account_info.__func__( + EngineServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_file.__func__(EngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return EngineServiceClient.from_service_account_file.__func__( + EngineServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py index 4254996f18bd..483ca0344ef9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,19 +63,17 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.engine_service import pagers from google.cloud.discoveryengine_v1.types import common from google.cloud.discoveryengine_v1.types import engine from google.cloud.discoveryengine_v1.types import engine as gcd_engine from google.cloud.discoveryengine_v1.types import engine_service - -from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import EngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import EngineServiceGrpcTransport from .transports.grpc_asyncio import EngineServiceGrpcAsyncIOTransport from .transports.rest import EngineServiceRestTransport @@ -639,11 +637,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EngineServiceClient._read_environment_variables() + ) self._client_cert_source = EngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +674,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py index ec1fde800ee2..bb69362b2193 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1.types import engine, engine_service +from google.cloud.discoveryengine_v1.types import engine +from google.cloud.discoveryengine_v1.types import engine_service class ListEnginesPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/__init__.py index b4ffb09de4fe..196454992873 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import EngineServiceTransport from .grpc import EngineServiceGrpcTransport from .grpc_asyncio import EngineServiceGrpcAsyncIOTransport -from .rest import EngineServiceRestInterceptor, EngineServiceRestTransport +from .rest import EngineServiceRestTransport +from .rest import EngineServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[EngineServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py index 057af87e23ae..f15c7156a20c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/base.py @@ -16,21 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import engine from google.cloud.discoveryengine_v1.types import engine as gcd_engine from google.cloud.discoveryengine_v1.types import engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -265,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py index c3cfe00e1a7c..d6412be55d6f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import engine from google.cloud.discoveryengine_v1.types import engine as gcd_engine from google.cloud.discoveryengine_v1.types import engine_service - -from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EngineServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py index af710f3f1ef7..79d5af88928c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/grpc_asyncio.py @@ -15,29 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import engine from google.cloud.discoveryengine_v1.types import engine as gcd_engine from google.cloud.discoveryengine_v1.types import engine_service - -from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EngineServiceTransport, DEFAULT_CLIENT_INFO from .grpc import EngineServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py index 5db6c2f5a8fe..d36ffc9dfb5f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest.py @@ -13,29 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import engine from google.cloud.discoveryengine_v1.types import engine as gcd_engine from google.cloud.discoveryengine_v1.types import engine_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEngineServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py index 325cff42db74..dc37e7222c3a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/engine_service/transports/rest_base.py @@ -14,19 +14,21 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import EngineServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import engine from google.cloud.discoveryengine_v1.types import engine as gcd_engine from google.cloud.discoveryengine_v1.types import engine_service - -from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseEngineServiceRestTransport(EngineServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/__init__.py index 6fea6cab0de9..4cfbfc0e118a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import GroundedGenerationServiceAsyncClient from .client import GroundedGenerationServiceClient +from .async_client import GroundedGenerationServiceAsyncClient __all__ = ( "GroundedGenerationServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py index f6720459006b..89a3659aaa68 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/async_client.py @@ -13,48 +13,48 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - AsyncIterable, - AsyncIterator, - Awaitable, - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, Optional, + AsyncIterable, + Awaitable, + AsyncIterator, Sequence, Tuple, Type, Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1.types import grounded_generation_service +from google.cloud.discoveryengine_v1.types import grounding from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import grounded_generation_service, grounding - -from .client import GroundedGenerationServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from .transports.base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import GroundedGenerationServiceGrpcAsyncIOTransport +from .client import GroundedGenerationServiceClient try: from google.api_core import client_logging # type: ignore @@ -140,7 +140,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_info.__func__(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) # type: ignore + return GroundedGenerationServiceClient.from_service_account_info.__func__( + GroundedGenerationServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -156,7 +158,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_file.__func__(GroundedGenerationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return GroundedGenerationServiceClient.from_service_account_file.__func__( + GroundedGenerationServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -194,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GroundedGenerationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py index d1e36741fd1a..c02ffff48635 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/client.py @@ -20,14 +20,14 @@ import os import re from typing import ( - Callable, Dict, - Iterable, - Iterator, + Callable, Mapping, MutableMapping, MutableSequence, Optional, + Iterable, + Iterator, Sequence, Tuple, Type, @@ -36,19 +36,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,12 +63,11 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1.types import grounded_generation_service +from google.cloud.discoveryengine_v1.types import grounding from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import grounded_generation_service, grounding - -from .transports.base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from .transports.base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import GroundedGenerationServiceGrpcTransport from .transports.grpc_asyncio import GroundedGenerationServiceGrpcAsyncIOTransport from .transports.rest import GroundedGenerationServiceRestTransport @@ -82,9 +81,7 @@ class GroundedGenerationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GroundedGenerationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport @@ -653,11 +650,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GroundedGenerationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GroundedGenerationServiceClient._read_environment_variables() + ) self._client_cert_source = ( GroundedGenerationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -694,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GroundedGenerationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py index 0f3052cbd079..bf39f5e977bd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import GroundedGenerationServiceTransport from .grpc import GroundedGenerationServiceGrpcTransport from .grpc_asyncio import GroundedGenerationServiceGrpcAsyncIOTransport -from .rest import ( - GroundedGenerationServiceRestInterceptor, - GroundedGenerationServiceRestTransport, -) +from .rest import GroundedGenerationServiceRestTransport +from .rest import GroundedGenerationServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GroundedGenerationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py index c62de3288072..53dc0d713e7a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import grounded_generation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -236,7 +237,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py index 31f2246b579b..e8675bf44707 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import grounded_generation_service - -from .base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -346,12 +347,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py index f566cd344b8e..9eca90058f3f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import grounded_generation_service - -from .base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO from .grpc import GroundedGenerationServiceGrpcTransport try: @@ -354,12 +355,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py index 85d027c4ce30..3f8f1667d434 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import grounded_generation_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGroundedGenerationServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -424,9 +430,7 @@ def __call__( """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() request, metadata = self._interceptor.pre_check_grounding(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_transcoded_request( @@ -584,9 +588,7 @@ def __call__( Response for the ``GenerateGroundedContent`` method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() request, metadata = self._interceptor.pre_generate_grounded_content( request, metadata @@ -726,7 +728,9 @@ def generate_grounded_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def stream_generate_grounded_content( @@ -737,7 +741,9 @@ def stream_generate_grounded_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StreamGenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._StreamGenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -795,9 +801,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -920,9 +924,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1063,9 +1065,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest_base.py index cc30d05f96fa..a2383e9df82b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/grounded_generation_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import grounded_generation_service - -from .base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseGroundedGenerationServiceRestTransport(GroundedGenerationServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/__init__.py index 776ac4568994..2059929c1612 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import IdentityMappingStoreServiceAsyncClient from .client import IdentityMappingStoreServiceClient +from .async_client import IdentityMappingStoreServiceAsyncClient __all__ = ( "IdentityMappingStoreServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py index 68b258cafda5..22bcccc9d587 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,23 +47,21 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( pagers, ) +from google.cloud.discoveryengine_v1.types import cmek_config_service +from google.cloud.discoveryengine_v1.types import identity_mapping_store from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import cmek_config_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store - -from .client import IdentityMappingStoreServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .transports.base import IdentityMappingStoreServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import IdentityMappingStoreServiceGrpcAsyncIOTransport +from .client import IdentityMappingStoreServiceClient try: from google.api_core import client_logging # type: ignore @@ -156,7 +155,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: IdentityMappingStoreServiceAsyncClient: The constructed client. """ - return IdentityMappingStoreServiceClient.from_service_account_info.__func__(IdentityMappingStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + return IdentityMappingStoreServiceClient.from_service_account_info.__func__( + IdentityMappingStoreServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -172,7 +173,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: IdentityMappingStoreServiceAsyncClient: The constructed client. """ - return IdentityMappingStoreServiceClient.from_service_account_file.__func__(IdentityMappingStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return IdentityMappingStoreServiceClient.from_service_account_file.__func__( + IdentityMappingStoreServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -210,7 +213,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return IdentityMappingStoreServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return IdentityMappingStoreServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> IdentityMappingStoreServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py index 0c75fcee6117..87014ea91cb6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,21 +63,19 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( pagers, ) +from google.cloud.discoveryengine_v1.types import cmek_config_service +from google.cloud.discoveryengine_v1.types import identity_mapping_store from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import cmek_config_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store - -from .transports.base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .transports.base import IdentityMappingStoreServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import IdentityMappingStoreServiceGrpcTransport from .transports.grpc_asyncio import IdentityMappingStoreServiceGrpcAsyncIOTransport from .transports.rest import IdentityMappingStoreServiceRestTransport @@ -91,13 +89,11 @@ class IdentityMappingStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] _transport_registry["grpc"] = IdentityMappingStoreServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = IdentityMappingStoreServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + IdentityMappingStoreServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = IdentityMappingStoreServiceRestTransport def get_transport_class( @@ -711,11 +707,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = IdentityMappingStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + IdentityMappingStoreServiceClient._read_environment_variables() + ) self._client_cert_source = ( IdentityMappingStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -752,8 +746,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(IdentityMappingStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py index baf9caba7fd4..3ce7cb9d9249 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,10 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1.types import ( - identity_mapping_store, - identity_mapping_store_service, -) +from google.cloud.discoveryengine_v1.types import identity_mapping_store +from google.cloud.discoveryengine_v1.types import identity_mapping_store_service class ListIdentityMappingsPager: @@ -72,7 +69,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -154,7 +151,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -240,7 +237,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -323,7 +320,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py index 174d9fb7f1c1..308c026d36a4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import IdentityMappingStoreServiceTransport from .grpc import IdentityMappingStoreServiceGrpcTransport from .grpc_asyncio import IdentityMappingStoreServiceGrpcAsyncIOTransport -from .rest import ( - IdentityMappingStoreServiceRestInterceptor, - IdentityMappingStoreServiceRestTransport, -) +from .rest import IdentityMappingStoreServiceRestTransport +from .rest import IdentityMappingStoreServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[IdentityMappingStoreServiceTransport]] _transport_registry["grpc"] = IdentityMappingStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = IdentityMappingStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = IdentityMappingStoreServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py index 6fc518202560..d45ed3792eb0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/base.py @@ -16,23 +16,25 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version +from google.cloud.discoveryengine_v1.types import identity_mapping_store from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -304,7 +306,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py index 9905e3da1955..f77702306ef6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc.py @@ -16,27 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1.types import identity_mapping_store from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store - -from .base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import IdentityMappingStoreServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -366,12 +368,12 @@ def create_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_identity_mapping_store" not in self._stubs: - self._stubs[ - "create_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", - request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, - response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["create_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", + request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, + response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["create_identity_mapping_store"] @@ -397,12 +399,12 @@ def get_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_identity_mapping_store" not in self._stubs: - self._stubs[ - "get_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", - request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, - response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["get_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", + request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, + response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["get_identity_mapping_store"] @@ -428,12 +430,12 @@ def delete_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_identity_mapping_store" not in self._stubs: - self._stubs[ - "delete_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", - request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", + request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_identity_mapping_store"] @@ -548,12 +550,12 @@ def list_identity_mapping_stores( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_identity_mapping_stores" not in self._stubs: - self._stubs[ - "list_identity_mapping_stores" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", - request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, - response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + self._stubs["list_identity_mapping_stores"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", + request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, + response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + ) ) return self._stubs["list_identity_mapping_stores"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py index 051c342a8e43..a892a76223da 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/grpc_asyncio.py @@ -15,31 +15,33 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore +from google.cloud.discoveryengine_v1.types import identity_mapping_store from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store - -from .base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import IdentityMappingStoreServiceTransport, DEFAULT_CLIENT_INFO from .grpc import IdentityMappingStoreServiceGrpcTransport try: @@ -376,12 +378,12 @@ def create_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "create_identity_mapping_store" not in self._stubs: - self._stubs[ - "create_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", - request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, - response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["create_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/CreateIdentityMappingStore", + request_serializer=identity_mapping_store_service.CreateIdentityMappingStoreRequest.serialize, + response_deserializer=gcd_identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["create_identity_mapping_store"] @@ -407,12 +409,12 @@ def get_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_identity_mapping_store" not in self._stubs: - self._stubs[ - "get_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", - request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, - response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + self._stubs["get_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/GetIdentityMappingStore", + request_serializer=identity_mapping_store_service.GetIdentityMappingStoreRequest.serialize, + response_deserializer=identity_mapping_store.IdentityMappingStore.deserialize, + ) ) return self._stubs["get_identity_mapping_store"] @@ -438,12 +440,12 @@ def delete_identity_mapping_store( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "delete_identity_mapping_store" not in self._stubs: - self._stubs[ - "delete_identity_mapping_store" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", - request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["delete_identity_mapping_store"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/DeleteIdentityMappingStore", + request_serializer=identity_mapping_store_service.DeleteIdentityMappingStoreRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["delete_identity_mapping_store"] @@ -558,12 +560,12 @@ def list_identity_mapping_stores( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "list_identity_mapping_stores" not in self._stubs: - self._stubs[ - "list_identity_mapping_stores" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", - request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, - response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + self._stubs["list_identity_mapping_stores"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.IdentityMappingStoreService/ListIdentityMappingStores", + request_serializer=identity_mapping_store_service.ListIdentityMappingStoresRequest.serialize, + response_deserializer=identity_mapping_store_service.ListIdentityMappingStoresResponse.deserialize, + ) ) return self._stubs["list_identity_mapping_stores"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py index 96444f77f638..1dac7d8819da 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest.py @@ -13,31 +13,38 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.cloud.discoveryengine_v1.types import identity_mapping_store from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseIdentityMappingStoreServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -903,9 +910,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseCreateIdentityMappingStore._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseCreateIdentityMappingStore._get_http_options() request, metadata = self._interceptor.pre_create_identity_mapping_store( request, metadata @@ -974,11 +979,10 @@ def __call__( resp = self._interceptor.post_create_identity_mapping_store(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_create_identity_mapping_store_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_create_identity_mapping_store_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1069,9 +1073,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseDeleteIdentityMappingStore._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseDeleteIdentityMappingStore._get_http_options() request, metadata = self._interceptor.pre_delete_identity_mapping_store( request, metadata @@ -1133,11 +1135,10 @@ def __call__( resp = self._interceptor.post_delete_identity_mapping_store(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_delete_identity_mapping_store_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_delete_identity_mapping_store_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1223,9 +1224,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseGetIdentityMappingStore._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseGetIdentityMappingStore._get_http_options() request, metadata = self._interceptor.pre_get_identity_mapping_store( request, metadata @@ -1379,9 +1378,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseImportIdentityMappings._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseImportIdentityMappings._get_http_options() request, metadata = self._interceptor.pre_import_identity_mappings( request, metadata @@ -1532,9 +1529,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappings._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappings._get_http_options() request, metadata = self._interceptor.pre_list_identity_mappings( request, metadata @@ -1689,9 +1684,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappingStores._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseListIdentityMappingStores._get_http_options() request, metadata = self._interceptor.pre_list_identity_mapping_stores( request, metadata @@ -1849,9 +1842,7 @@ def __call__( """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BasePurgeIdentityMappings._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BasePurgeIdentityMappings._get_http_options() request, metadata = self._interceptor.pre_purge_identity_mappings( request, metadata @@ -1953,7 +1944,9 @@ def create_identity_mapping_store( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._CreateIdentityMappingStore(self._session, self._host, self._interceptor) # type: ignore + return self._CreateIdentityMappingStore( + self._session, self._host, self._interceptor + ) # type: ignore @property def delete_identity_mapping_store( @@ -1964,7 +1957,9 @@ def delete_identity_mapping_store( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DeleteIdentityMappingStore(self._session, self._host, self._interceptor) # type: ignore + return self._DeleteIdentityMappingStore( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_identity_mapping_store( @@ -1975,7 +1970,9 @@ def get_identity_mapping_store( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetIdentityMappingStore(self._session, self._host, self._interceptor) # type: ignore + return self._GetIdentityMappingStore( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_identity_mappings( @@ -1986,7 +1983,9 @@ def import_identity_mappings( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportIdentityMappings(self._session, self._host, self._interceptor) # type: ignore + return self._ImportIdentityMappings( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_identity_mappings( @@ -2008,7 +2007,9 @@ def list_identity_mapping_stores( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ListIdentityMappingStores(self._session, self._host, self._interceptor) # type: ignore + return self._ListIdentityMappingStores( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_identity_mappings( @@ -2077,9 +2078,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2202,9 +2201,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseIdentityMappingStoreServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2345,9 +2342,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseIdentityMappingStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseIdentityMappingStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseIdentityMappingStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py index ace057d7e5c4..c6d070ee761a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/identity_mapping_store_service/transports/rest_base.py @@ -14,21 +14,23 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import IdentityMappingStoreServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format +from google.cloud.discoveryengine_v1.types import identity_mapping_store from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store - -from .base import DEFAULT_CLIENT_INFO, IdentityMappingStoreServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseIdentityMappingStoreServiceRestTransport( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/__init__.py index 92a56900c029..f42a6de5f23b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ProjectServiceAsyncClient from .client import ProjectServiceClient +from .async_client import ProjectServiceAsyncClient __all__ = ( "ProjectServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py index 70d0d80a8504..508266526505 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,14 +47,13 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.types import project +from google.cloud.discoveryengine_v1.types import project_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import project, project_service - -from .client import ProjectServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from .transports.base import ProjectServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ProjectServiceGrpcAsyncIOTransport +from .client import ProjectServiceClient try: from google.api_core import client_logging # type: ignore @@ -119,7 +119,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_info.__func__(ProjectServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ProjectServiceClient.from_service_account_info.__func__( + ProjectServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +137,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_file.__func__(ProjectServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ProjectServiceClient.from_service_account_file.__func__( + ProjectServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py index af3d906d848f..1ad0bc231604 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,12 +63,11 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.types import project +from google.cloud.discoveryengine_v1.types import project_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import project, project_service - -from .transports.base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from .transports.base import ProjectServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ProjectServiceGrpcTransport from .transports.grpc_asyncio import ProjectServiceGrpcAsyncIOTransport from .transports.rest import ProjectServiceRestTransport @@ -82,9 +81,7 @@ class ProjectServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProjectServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] _transport_registry["grpc"] = ProjectServiceGrpcTransport _transport_registry["grpc_asyncio"] = ProjectServiceGrpcAsyncIOTransport _transport_registry["rest"] = ProjectServiceRestTransport @@ -601,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectServiceClient._read_environment_variables() + ) self._client_cert_source = ProjectServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/__init__.py index 34168b4c507d..37999d2dc481 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import ProjectServiceTransport from .grpc import ProjectServiceGrpcTransport from .grpc_asyncio import ProjectServiceGrpcAsyncIOTransport -from .rest import ProjectServiceRestInterceptor, ProjectServiceRestTransport +from .rest import ProjectServiceRestTransport +from .rest import ProjectServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py index 77e609a32684..5ec80f9ad46d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/base.py @@ -16,19 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import project_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -204,7 +206,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py index f34176357d51..26042ed591f1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import project_service - -from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ProjectServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py index 4b559d1624d2..7330ceac9fdf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/grpc_asyncio.py @@ -15,27 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import project_service - -from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ProjectServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ProjectServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py index 0a0653653735..ec3c5c7f18bc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest.py @@ -13,27 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import project_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseProjectServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -541,9 +548,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() request, metadata = self._interceptor.pre_provision_project( request, metadata @@ -699,9 +704,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest_base.py index ffe02057fffc..2418c88dfa0a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/project_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ProjectServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import project_service - -from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseProjectServiceRestTransport(ProjectServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/__init__.py index b87f3b8d87d4..cff8ae0bd628 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import RankServiceAsyncClient from .client import RankServiceClient +from .async_client import RankServiceAsyncClient __all__ = ( "RankServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py index bc75f18dbbf6..53d05eb431a7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,29 +29,28 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1.types import rank_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import rank_service - -from .client import RankServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, RankServiceTransport +from .transports.base import RankServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import RankServiceGrpcAsyncIOTransport +from .client import RankServiceClient try: from google.api_core import client_logging # type: ignore @@ -113,7 +112,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_info.__func__(RankServiceAsyncClient, info, *args, **kwargs) # type: ignore + return RankServiceClient.from_service_account_info.__func__( + RankServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_file.__func__(RankServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return RankServiceClient.from_service_account_file.__func__( + RankServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py index 601055c28dcb..ff18f9a09474 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,12 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1.types import rank_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import rank_service - -from .transports.base import DEFAULT_CLIENT_INFO, RankServiceTransport +from .transports.base import RankServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import RankServiceGrpcTransport from .transports.grpc_asyncio import RankServiceGrpcAsyncIOTransport from .transports.rest import RankServiceRestTransport @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RankServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RankServiceClient._read_environment_variables() + ) self._client_cert_source = RankServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RankServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/__init__.py index f45de8a44763..3ea75b53c7b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import RankServiceTransport from .grpc import RankServiceGrpcTransport from .grpc_asyncio import RankServiceGrpcAsyncIOTransport -from .rest import RankServiceRestInterceptor, RankServiceRestTransport +from .rest import RankServiceRestTransport +from .rest import RankServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[RankServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py index 4ef2e84081b8..028ed1fcf29b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import rank_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -199,7 +200,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py index da47ea55a36c..da7e8bcb279f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import rank_service - -from .base import DEFAULT_CLIENT_INFO, RankServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RankServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py index 356285718df1..3d36c9ac719b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import rank_service - -from .base import DEFAULT_CLIENT_INFO, RankServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RankServiceTransport, DEFAULT_CLIENT_INFO from .grpc import RankServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py index ec034858eae5..b08081f9879f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import rank_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseRankServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest_base.py index 1e4bab85e887..5cabd357d2f4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/rank_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import RankServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import rank_service - -from .base import DEFAULT_CLIENT_INFO, RankServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseRankServiceRestTransport(RankServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/__init__.py index 6a625342219a..4ddd61f41d3e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import RecommendationServiceAsyncClient from .client import RecommendationServiceClient +from .async_client import RecommendationServiceAsyncClient __all__ = ( "RecommendationServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py index c1ce0fab69d5..4bdd37f7f529 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,29 +29,28 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1.types import recommendation_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import recommendation_service - -from .client import RecommendationServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from .transports.base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import RecommendationServiceGrpcAsyncIOTransport +from .client import RecommendationServiceClient try: from google.api_core import client_logging # type: ignore @@ -127,7 +126,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_info.__func__(RecommendationServiceAsyncClient, info, *args, **kwargs) # type: ignore + return RecommendationServiceClient.from_service_account_info.__func__( + RecommendationServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_file.__func__(RecommendationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return RecommendationServiceClient.from_service_account_file.__func__( + RecommendationServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -181,7 +184,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RecommendationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RecommendationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RecommendationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py index de134a234495..717202029f98 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,12 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1.types import recommendation_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import recommendation_service - -from .transports.base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from .transports.base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import RecommendationServiceGrpcTransport from .transports.grpc_asyncio import RecommendationServiceGrpcAsyncIOTransport from .transports.rest import RecommendationServiceRestTransport @@ -80,9 +78,7 @@ class RecommendationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RecommendationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport @@ -684,11 +680,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RecommendationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RecommendationServiceClient._read_environment_variables() + ) self._client_cert_source = RecommendationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -723,8 +717,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RecommendationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py index f21f53c111bf..a7477e51c44b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import RecommendationServiceTransport from .grpc import RecommendationServiceGrpcTransport from .grpc_asyncio import RecommendationServiceGrpcAsyncIOTransport -from .rest import ( - RecommendationServiceRestInterceptor, - RecommendationServiceRestTransport, -) +from .rest import RecommendationServiceRestTransport +from .rest import RecommendationServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RecommendationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py index 4c86cefda588..1c50797c2b98 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import recommendation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -202,7 +203,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py index 87a59a304273..7dce84df21e3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import recommendation_service - -from .base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py index f7813777b005..acf1a81805d0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import recommendation_service - -from .base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO from .grpc import RecommendationServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py index 5720b3cc98b0..0c73dad8a426 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import recommendation_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseRecommendationServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -358,9 +364,7 @@ def __call__( """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() request, metadata = self._interceptor.pre_recommend(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseRecommend._get_transcoded_request( @@ -522,9 +526,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -647,9 +649,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -788,9 +788,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest_base.py index 62761d1fbd9c..8a06009b724c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/recommendation_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import recommendation_service - -from .base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseRecommendationServiceRestTransport(RecommendationServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/__init__.py index f95513aefa30..0908014e8c82 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SchemaServiceAsyncClient from .client import SchemaServiceClient +from .async_client import SchemaServiceAsyncClient __all__ = ( "SchemaServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py index cae8913850a8..308ba3b1bef7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,19 +47,17 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.schema_service import pagers from google.cloud.discoveryengine_v1.types import schema from google.cloud.discoveryengine_v1.types import schema as gcd_schema from google.cloud.discoveryengine_v1.types import schema_service - -from .client import SchemaServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from .transports.base import SchemaServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SchemaServiceGrpcAsyncIOTransport +from .client import SchemaServiceClient try: from google.api_core import client_logging # type: ignore @@ -126,7 +125,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_info.__func__(SchemaServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SchemaServiceClient.from_service_account_info.__func__( + SchemaServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_file.__func__(SchemaServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SchemaServiceClient.from_service_account_file.__func__( + SchemaServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py index 0f5b6397db4d..63955ef5b3b7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,17 +63,15 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.schema_service import pagers from google.cloud.discoveryengine_v1.types import schema from google.cloud.discoveryengine_v1.types import schema as gcd_schema from google.cloud.discoveryengine_v1.types import schema_service - -from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from .transports.base import SchemaServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SchemaServiceGrpcTransport from .transports.grpc_asyncio import SchemaServiceGrpcAsyncIOTransport from .transports.rest import SchemaServiceRestTransport @@ -635,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SchemaServiceClient._read_environment_variables() + ) self._client_cert_source = SchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py index 39d3aa982444..c95ccd00d204 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1.types import schema, schema_service +from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema_service class ListSchemasPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/__init__.py index d21d5baa6100..78c2fa21d683 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import SchemaServiceTransport from .grpc import SchemaServiceGrpcTransport from .grpc_asyncio import SchemaServiceGrpcAsyncIOTransport -from .rest import SchemaServiceRestInterceptor, SchemaServiceRestTransport +from .rest import SchemaServiceRestTransport +from .rest import SchemaServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[SchemaServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py index 0ad1ceb12bf5..dfb078f3e1ec 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/base.py @@ -16,19 +16,22 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import schema, schema_service +from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -263,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py index ff6e12c5ed53..fde00913d573 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc.py @@ -16,23 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1.types import schema, schema_service - -from .base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py index 86e834072ee1..1b41178cedda 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/grpc_asyncio.py @@ -15,27 +15,30 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1.types import schema, schema_service - -from .base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SchemaServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py index 55873e594a9c..0caed11cdd00 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest.py @@ -13,27 +13,35 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1.types import schema, schema_service -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSchemaServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest_base.py index dcd2de979b3a..0044327fae10 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/schema_service/transports/rest_base.py @@ -14,17 +14,20 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1.types import schema, schema_service +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, SchemaServiceTransport + +from google.cloud.discoveryengine_v1.types import schema +from google.cloud.discoveryengine_v1.types import schema_service +from google.longrunning import operations_pb2 # type: ignore class _BaseSchemaServiceRestTransport(SchemaServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/__init__.py index 96aaa3993300..2be7ab3ff9b0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SearchServiceAsyncClient from .client import SearchServiceClient +from .async_client import SearchServiceAsyncClient __all__ = ( "SearchServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py index 29a56caccd71..fb071c034b87 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,30 +29,29 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.search_service import pagers from google.cloud.discoveryengine_v1.types import search_service - -from .client import SearchServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .transports.base import SearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SearchServiceGrpcAsyncIOTransport +from .client import SearchServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +127,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_info.__func__(SearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SearchServiceClient.from_service_account_info.__func__( + SearchServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_file.__func__(SearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SearchServiceClient.from_service_account_file.__func__( + SearchServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py index cbdc72272d57..042dc071e3c0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,13 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.search_service import pagers from google.cloud.discoveryengine_v1.types import search_service - -from .transports.base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .transports.base import SearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SearchServiceGrpcTransport from .transports.grpc_asyncio import SearchServiceGrpcAsyncIOTransport from .transports.rest import SearchServiceRestTransport @@ -729,11 +727,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchServiceClient._read_environment_variables() + ) self._client_cert_source = SearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -768,8 +764,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py index d3a0656343e3..8ec155295784 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -67,7 +66,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +142,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +298,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/__init__.py index 24f3c65a62e4..62c175446415 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import SearchServiceTransport from .grpc import SearchServiceGrpcTransport from .grpc_asyncio import SearchServiceGrpcAsyncIOTransport -from .rest import SearchServiceRestInterceptor, SearchServiceRestTransport +from .rest import SearchServiceRestTransport +from .rest import SearchServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[SearchServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py index 031b664b5ad4..d851b98de616 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import search_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -213,7 +214,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py index 75d3d2e6b966..5e8bf4f1e289 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_service - -from .base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py index ce258458a3c8..b9127b748af7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import search_service - -from .base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SearchServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py index 202f27b30213..9b8d9d0671e1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import search_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSearchServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest_base.py index aee220d223d7..b98c76f83e74 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SearchServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import search_service - -from .base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseSearchServiceRestTransport(SearchServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/__init__.py index 1759c51ec4ab..6b603bf03c01 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SearchTuningServiceAsyncClient from .client import SearchTuningServiceClient +from .async_client import SearchTuningServiceAsyncClient __all__ = ( "SearchTuningServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py index b1641981be86..deae6ae826e4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,17 +47,13 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.types import custom_tuning_model +from google.cloud.discoveryengine_v1.types import search_tuning_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import ( - custom_tuning_model, - search_tuning_service, -) - -from .client import SearchTuningServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from .transports.base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SearchTuningServiceGrpcAsyncIOTransport +from .client import SearchTuningServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +125,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_info.__func__(SearchTuningServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SearchTuningServiceClient.from_service_account_info.__func__( + SearchTuningServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +143,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_file.__func__(SearchTuningServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SearchTuningServiceClient.from_service_account_file.__func__( + SearchTuningServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -182,7 +183,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SearchTuningServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py index caa806592de5..534165937762 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,15 +63,11 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.types import custom_tuning_model +from google.cloud.discoveryengine_v1.types import search_tuning_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import ( - custom_tuning_model, - search_tuning_service, -) - -from .transports.base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from .transports.base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SearchTuningServiceGrpcTransport from .transports.grpc_asyncio import SearchTuningServiceGrpcAsyncIOTransport from .transports.rest import SearchTuningServiceRestTransport @@ -85,9 +81,7 @@ class SearchTuningServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SearchTuningServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport @@ -637,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchTuningServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchTuningServiceClient._read_environment_variables() + ) self._client_cert_source = SearchTuningServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -676,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchTuningServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py index d759f5c3cdcd..a1d0aa1f0e9f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/__init__.py @@ -19,12 +19,12 @@ from .base import SearchTuningServiceTransport from .grpc import SearchTuningServiceGrpcTransport from .grpc_asyncio import SearchTuningServiceGrpcAsyncIOTransport -from .rest import SearchTuningServiceRestInterceptor, SearchTuningServiceRestTransport +from .rest import SearchTuningServiceRestTransport +from .rest import SearchTuningServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SearchTuningServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py index ca2f767e56cc..e2765fc4e868 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/base.py @@ -16,19 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import search_tuning_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -221,7 +223,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py index 517cd9fa2925..3706b755cc5d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_tuning_service - -from .base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py index 2230de5a3f2e..715b612c881e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/grpc_asyncio.py @@ -15,27 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import search_tuning_service - -from .base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SearchTuningServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py index 381276207316..0603234ffa5d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest.py @@ -13,27 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import search_tuning_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSearchTuningServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -601,9 +608,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() request, metadata = self._interceptor.pre_list_custom_models( request, metadata @@ -756,9 +761,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() request, metadata = self._interceptor.pre_train_custom_model( request, metadata @@ -928,9 +931,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1051,9 +1052,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1192,9 +1191,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest_base.py index cbc8b44d20fb..61387595c118 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/search_tuning_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import search_tuning_service - -from .base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseSearchTuningServiceRestTransport(SearchTuningServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/__init__.py index 5e424baa78b8..123f6508d9a5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ServingConfigServiceAsyncClient from .client import ServingConfigServiceClient +from .async_client import ServingConfigServiceAsyncClient __all__ = ( "ServingConfigServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py index 3ae0776e9c27..1609f70052ee 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,33 +29,32 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config +from google.cloud.discoveryengine_v1.types import serving_config_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import serving_config_service - -from .client import ServingConfigServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from .transports.base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ServingConfigServiceGrpcAsyncIOTransport +from .client import ServingConfigServiceClient try: from google.api_core import client_logging # type: ignore @@ -123,7 +122,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_info.__func__(ServingConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ServingConfigServiceClient.from_service_account_info.__func__( + ServingConfigServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -139,7 +140,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_file.__func__(ServingConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ServingConfigServiceClient.from_service_account_file.__func__( + ServingConfigServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -177,7 +180,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ServingConfigServiceTransport: @@ -364,7 +369,7 @@ async def sample_update_serving_config(): [ServingConfig][google.cloud.discoveryengine.v1.ServingConfig] to update. The following are NOT supported: - - [ServingConfig.name][google.cloud.discoveryengine.v1.ServingConfig.name] + - [ServingConfig.name][google.cloud.discoveryengine.v1.ServingConfig.name] If not set, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py index 3d7b8bf969b2..c3aa756ed9b2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,16 +61,14 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config +from google.cloud.discoveryengine_v1.types import serving_config_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import serving_config_service - -from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from .transports.base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ServingConfigServiceGrpcTransport from .transports.grpc_asyncio import ServingConfigServiceGrpcAsyncIOTransport from .transports.rest import ServingConfigServiceRestTransport @@ -84,9 +82,7 @@ class ServingConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServingConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport @@ -616,11 +612,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServingConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServingConfigServiceClient._read_environment_variables() + ) self._client_cert_source = ServingConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -655,8 +649,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServingConfigServiceTransport, transport) self._api_endpoint = self._transport.host @@ -788,7 +781,7 @@ def sample_update_serving_config(): [ServingConfig][google.cloud.discoveryengine.v1.ServingConfig] to update. The following are NOT supported: - - [ServingConfig.name][google.cloud.discoveryengine.v1.ServingConfig.name] + - [ServingConfig.name][google.cloud.discoveryengine.v1.ServingConfig.name] If not set, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py index 6bdd4697d637..21e7b3091b0a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/__init__.py @@ -19,12 +19,12 @@ from .base import ServingConfigServiceTransport from .grpc import ServingConfigServiceGrpcTransport from .grpc_asyncio import ServingConfigServiceGrpcAsyncIOTransport -from .rest import ServingConfigServiceRestInterceptor, ServingConfigServiceRestTransport +from .rest import ServingConfigServiceRestTransport +from .rest import ServingConfigServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServingConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py index 16cb9121569f..18b73447fe06 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/base.py @@ -16,20 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config from google.cloud.discoveryengine_v1.types import serving_config_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -203,7 +204,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py index d1c6a2fa0b24..c9746425faf5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc.py @@ -16,24 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config from google.cloud.discoveryengine_v1.types import serving_config_service - -from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py index a4f8d822aa90..603475f6fea7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/grpc_asyncio.py @@ -15,28 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config from google.cloud.discoveryengine_v1.types import serving_config_service - -from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ServingConfigServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py index 308ca01f41d5..645ca5f42e0b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest.py @@ -13,28 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config from google.cloud.discoveryengine_v1.types import serving_config_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseServingConfigServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -365,9 +371,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() request, metadata = self._interceptor.pre_update_serving_config( request, metadata @@ -533,9 +537,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -656,9 +658,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -797,9 +797,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest_base.py index 002043d83096..9c9b499e83c1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/serving_config_service/transports/rest_base.py @@ -14,18 +14,20 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config from google.cloud.discoveryengine_v1.types import serving_config_service - -from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseServingConfigServiceRestTransport(ServingConfigServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/__init__.py index c278fb1603a2..a00026df42c5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SessionServiceAsyncClient from .client import SessionServiceClient +from .async_client import SessionServiceAsyncClient __all__ = ( "SessionServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py index b347e794ea27..b0595a73a5b6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,34 +29,33 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.session_service import pagers from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session - -from .client import SessionServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SessionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SessionServiceGrpcAsyncIOTransport +from .client import SessionServiceClient try: from google.api_core import client_logging # type: ignore @@ -132,7 +131,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_info.__func__(SessionServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SessionServiceClient.from_service_account_info.__func__( + SessionServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +149,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_file.__func__(SessionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SessionServiceClient.from_service_account_file.__func__( + SessionServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -589,7 +592,7 @@ async def sample_update_session(): [Session][google.cloud.discoveryengine.v1.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1.Session.name] + - [Session.name][google.cloud.discoveryengine.v1.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py index c1e4e7041229..02b8c62b768b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,17 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.session_service import pagers from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session - -from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SessionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SessionServiceGrpcTransport from .transports.grpc_asyncio import SessionServiceGrpcAsyncIOTransport from .transports.rest import SessionServiceRestTransport @@ -85,9 +83,7 @@ class SessionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] _transport_registry["grpc"] = SessionServiceGrpcTransport _transport_registry["grpc_asyncio"] = SessionServiceGrpcAsyncIOTransport _transport_registry["rest"] = SessionServiceRestTransport @@ -741,11 +737,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionServiceClient._read_environment_variables() + ) self._client_cert_source = SessionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -780,8 +774,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1126,7 +1119,7 @@ def sample_update_session(): [Session][google.cloud.discoveryengine.v1.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1.Session.name] + - [Session.name][google.cloud.discoveryengine.v1.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py index 81daa2b85b5d..093e26b62dd5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1.types import conversational_search_service, session +from google.cloud.discoveryengine_v1.types import conversational_search_service +from google.cloud.discoveryengine_v1.types import session class ListSessionsPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/__init__.py index d258a984225b..541203cdd07f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import SessionServiceTransport from .grpc import SessionServiceGrpcTransport from .grpc_asyncio import SessionServiceGrpcAsyncIOTransport -from .rest import SessionServiceRestInterceptor, SessionServiceRestTransport +from .rest import SessionServiceRestTransport +from .rest import SessionServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py index 12576764ebe4..513f27fa5ad3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/base.py @@ -16,22 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -261,7 +262,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py index 8b0fc2b575ea..f882ad4209ab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc.py @@ -16,26 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SessionServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py index b25a483d8ec6..b45efb707998 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/grpc_asyncio.py @@ -15,30 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SessionServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SessionServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py index 0248e2b45739..cc0afa243435 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest.py @@ -13,30 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -1292,9 +1298,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py index 639adc3c8330..8d879c3a3400 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/session_service/transports/rest_base.py @@ -14,20 +14,22 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SessionServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import conversational_search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseSessionServiceRestTransport(SessionServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/__init__.py index 8039b8753159..3bffbf62365f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SiteSearchEngineServiceAsyncClient from .client import SiteSearchEngineServiceClient +from .async_client import SiteSearchEngineServiceAsyncClient __all__ = ( "SiteSearchEngineServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py index 1dd928221c4d..a73e7aa057be 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,20 +47,16 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.services.site_search_engine_service import pagers +from google.cloud.discoveryengine_v1.types import site_search_engine +from google.cloud.discoveryengine_v1.types import site_search_engine_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.services.site_search_engine_service import pagers -from google.cloud.discoveryengine_v1.types import ( - site_search_engine, - site_search_engine_service, -) - -from .client import SiteSearchEngineServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from .transports.base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SiteSearchEngineServiceGrpcAsyncIOTransport +from .client import SiteSearchEngineServiceClient try: from google.api_core import client_logging # type: ignore @@ -139,7 +136,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_info.__func__(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SiteSearchEngineServiceClient.from_service_account_info.__func__( + SiteSearchEngineServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +154,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_file.__func__(SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SiteSearchEngineServiceClient.from_service_account_file.__func__( + SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -193,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SiteSearchEngineServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py index f8b1fcf5ad26..7803e79bd1fc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,18 +63,14 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.services.site_search_engine_service import pagers +from google.cloud.discoveryengine_v1.types import site_search_engine +from google.cloud.discoveryengine_v1.types import site_search_engine_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.services.site_search_engine_service import pagers -from google.cloud.discoveryengine_v1.types import ( - site_search_engine, - site_search_engine_service, -) - -from .transports.base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from .transports.base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SiteSearchEngineServiceGrpcTransport from .transports.grpc_asyncio import SiteSearchEngineServiceGrpcAsyncIOTransport from .transports.rest import SiteSearchEngineServiceRestTransport @@ -88,9 +84,7 @@ class SiteSearchEngineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport @@ -666,11 +660,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteSearchEngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteSearchEngineServiceClient._read_environment_variables() + ) self._client_cert_source = ( SiteSearchEngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -707,8 +699,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteSearchEngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py index 02ccb3146820..0fc95ca5bce0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,10 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1.types import ( - site_search_engine, - site_search_engine_service, -) +from google.cloud.discoveryengine_v1.types import site_search_engine +from google.cloud.discoveryengine_v1.types import site_search_engine_service class ListTargetSitesPager: @@ -70,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -315,7 +312,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py index 5443c0c10cf1..31f1983d1847 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import SiteSearchEngineServiceTransport from .grpc import SiteSearchEngineServiceGrpcTransport from .grpc_asyncio import SiteSearchEngineServiceGrpcAsyncIOTransport -from .rest import ( - SiteSearchEngineServiceRestInterceptor, - SiteSearchEngineServiceRestTransport, -) +from .rest import SiteSearchEngineServiceRestTransport +from .rest import SiteSearchEngineServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py index cc325dbf414f..977a85efeec9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/base.py @@ -16,22 +16,22 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import ( - site_search_engine, - site_search_engine_service, -) +from google.cloud.discoveryengine_v1.types import site_search_engine +from google.cloud.discoveryengine_v1.types import site_search_engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -415,7 +415,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py index 082f14f87f21..1b96c76ad5ea 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc.py @@ -16,26 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1.types import ( - site_search_engine, - site_search_engine_service, -) - -from .base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from google.cloud.discoveryengine_v1.types import site_search_engine +from google.cloud.discoveryengine_v1.types import site_search_engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -657,12 +657,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -689,12 +689,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -782,12 +782,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py index 2614081a8a1b..d5ed140f0399 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/grpc_asyncio.py @@ -15,30 +15,30 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1.types import ( - site_search_engine, - site_search_engine_service, -) - -from .base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from google.cloud.discoveryengine_v1.types import site_search_engine +from google.cloud.discoveryengine_v1.types import site_search_engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SiteSearchEngineServiceGrpcTransport try: @@ -671,12 +671,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -703,12 +703,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -797,12 +797,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py index d81dea2526f0..292f5a6ba9bd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest.py @@ -13,30 +13,35 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1.types import site_search_engine +from google.cloud.discoveryengine_v1.types import site_search_engine_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1.types import ( - site_search_engine, - site_search_engine_service, -) -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSiteSearchEngineServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -1354,9 +1359,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_create_target_sites( request, metadata @@ -1510,9 +1513,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_verify_target_sites( request, metadata @@ -1666,9 +1667,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() request, metadata = self._interceptor.pre_create_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_transcoded_request( @@ -1822,9 +1821,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() request, metadata = self._interceptor.pre_create_target_site( request, metadata @@ -1979,9 +1976,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() request, metadata = self._interceptor.pre_delete_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_transcoded_request( @@ -2129,9 +2124,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() request, metadata = self._interceptor.pre_delete_target_site( request, metadata @@ -2285,9 +2278,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_disable_advanced_site_search( request, metadata @@ -2442,9 +2433,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_enable_advanced_site_search( request, metadata @@ -2600,9 +2589,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() request, metadata = self._interceptor.pre_fetch_domain_verification_status( request, metadata @@ -2670,11 +2657,10 @@ def __call__( resp = self._interceptor.post_fetch_domain_verification_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_domain_verification_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_domain_verification_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2761,9 +2747,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() request, metadata = self._interceptor.pre_fetch_sitemaps(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_transcoded_request( @@ -2918,9 +2902,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() request, metadata = self._interceptor.pre_get_site_search_engine( request, metadata @@ -3073,9 +3055,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() request, metadata = self._interceptor.pre_get_target_site(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_transcoded_request( @@ -3225,9 +3205,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() request, metadata = self._interceptor.pre_list_target_sites( request, metadata @@ -3384,9 +3362,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() request, metadata = self._interceptor.pre_recrawl_uris(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_transcoded_request( @@ -3538,9 +3514,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() request, metadata = self._interceptor.pre_update_target_site( request, metadata @@ -3644,7 +3618,9 @@ def batch_create_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_verify_target_sites( @@ -3655,7 +3631,9 @@ def batch_verify_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchVerifyTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchVerifyTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_sitemap( @@ -3706,7 +3684,9 @@ def disable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DisableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._DisableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_advanced_site_search( @@ -3717,7 +3697,9 @@ def enable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EnableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._EnableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_domain_verification_status( @@ -3728,7 +3710,9 @@ def fetch_domain_verification_status( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchDomainVerificationStatus(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDomainVerificationStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_sitemaps( @@ -3849,9 +3833,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3974,9 +3956,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -4115,9 +4095,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest_base.py index 1851547a35ec..20831ce79c2d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/site_search_engine_service/transports/rest_base.py @@ -14,20 +14,20 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1.types import ( - site_search_engine, - site_search_engine_service, -) +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport + +from google.cloud.discoveryengine_v1.types import site_search_engine +from google.cloud.discoveryengine_v1.types import site_search_engine_service +from google.longrunning import operations_pb2 # type: ignore class _BaseSiteSearchEngineServiceRestTransport(SiteSearchEngineServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/__init__.py index eea5da67c013..4c45751a520f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import UserEventServiceAsyncClient from .client import UserEventServiceClient +from .async_client import UserEventServiceAsyncClient __all__ = ( "UserEventServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py index f7f698f5f8bb..64029b9bc329 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -47,22 +48,18 @@ from google.api import httpbody_pb2 # type: ignore from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.discoveryengine_v1.types import user_event +from google.cloud.discoveryengine_v1.types import user_event_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import any_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import ( - common, - import_config, - purge_config, - user_event, - user_event_service, -) - -from .client import UserEventServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from .transports.base import UserEventServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import UserEventServiceGrpcAsyncIOTransport +from .client import UserEventServiceClient try: from google.api_core import client_logging # type: ignore @@ -132,7 +129,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_info.__func__(UserEventServiceAsyncClient, info, *args, **kwargs) # type: ignore + return UserEventServiceClient.from_service_account_info.__func__( + UserEventServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +147,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_file.__func__(UserEventServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return UserEventServiceClient.from_service_account_file.__func__( + UserEventServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py index f70be2aaff4b..a27d3ceaf666 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -64,20 +64,16 @@ from google.api import httpbody_pb2 # type: ignore from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.discoveryengine_v1.types import user_event +from google.cloud.discoveryengine_v1.types import user_event_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import any_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.types import ( - common, - import_config, - purge_config, - user_event, - user_event_service, -) - -from .transports.base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from .transports.base import UserEventServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import UserEventServiceGrpcTransport from .transports.grpc_asyncio import UserEventServiceGrpcAsyncIOTransport from .transports.rest import UserEventServiceRestTransport @@ -91,9 +87,7 @@ class UserEventServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserEventServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] _transport_registry["grpc"] = UserEventServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserEventServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserEventServiceRestTransport @@ -669,11 +663,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserEventServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserEventServiceClient._read_environment_variables() + ) self._client_cert_source = UserEventServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -708,8 +700,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserEventServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/__init__.py index 771ec74658ec..d136d6cf3abb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import UserEventServiceTransport from .grpc import UserEventServiceGrpcTransport from .grpc_asyncio import UserEventServiceGrpcAsyncIOTransport -from .rest import UserEventServiceRestInterceptor, UserEventServiceRestTransport +from .rest import UserEventServiceRestTransport +from .rest import UserEventServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py index 79f375da5157..60d565dc30a6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/base.py @@ -16,25 +16,25 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version -from google.cloud.discoveryengine_v1.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.discoveryengine_v1.types import user_event +from google.cloud.discoveryengine_v1.types import user_event_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -261,7 +261,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py index 22f744b83b5d..e636cd16396b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc.py @@ -16,29 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) - -from .base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.discoveryengine_v1.types import user_event +from google.cloud.discoveryengine_v1.types import user_event_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import UserEventServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py index c18441a8fb15..e7270035aa5a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/grpc_asyncio.py @@ -15,33 +15,33 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) - -from .base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.discoveryengine_v1.types import user_event +from google.cloud.discoveryengine_v1.types import user_event_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import UserEventServiceTransport, DEFAULT_CLIENT_INFO from .grpc import UserEventServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py index e93d914728ee..3ae61e5bcfe2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest.py @@ -13,33 +13,38 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.discoveryengine_v1.types import user_event +from google.cloud.discoveryengine_v1.types import user_event_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseUserEventServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -762,9 +767,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() request, metadata = self._interceptor.pre_collect_user_event( request, metadata @@ -914,9 +917,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() request, metadata = self._interceptor.pre_import_user_events( request, metadata @@ -1069,9 +1070,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() request, metadata = self._interceptor.pre_purge_user_events( request, metadata @@ -1224,9 +1223,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() request, metadata = self._interceptor.pre_write_user_event( request, metadata @@ -1409,9 +1406,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1671,9 +1666,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserEventServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest_base.py index 55a14e57a4b0..355429b12570 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_event_service/transports/rest_base.py @@ -14,23 +14,23 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import UserEventServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union + from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.discoveryengine_v1.types import user_event +from google.cloud.discoveryengine_v1.types import user_event_service from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format - -from google.cloud.discoveryengine_v1.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) - -from .base import DEFAULT_CLIENT_INFO, UserEventServiceTransport class _BaseUserEventServiceRestTransport(UserEventServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/__init__.py index acdd866e7cf5..e0ac86665fab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import UserLicenseServiceAsyncClient from .client import UserLicenseServiceClient +from .async_client import UserLicenseServiceAsyncClient __all__ = ( "UserLicenseServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py index dcebff58820b..82e5f158ecf4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,15 +47,14 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.services.user_license_service import pagers +from google.cloud.discoveryengine_v1.types import user_license +from google.cloud.discoveryengine_v1.types import user_license_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.services.user_license_service import pagers -from google.cloud.discoveryengine_v1.types import user_license, user_license_service - -from .client import UserLicenseServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, UserLicenseServiceTransport +from .transports.base import UserLicenseServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import UserLicenseServiceGrpcAsyncIOTransport +from .client import UserLicenseServiceClient try: from google.api_core import client_logging # type: ignore @@ -122,7 +122,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserLicenseServiceAsyncClient: The constructed client. """ - return UserLicenseServiceClient.from_service_account_info.__func__(UserLicenseServiceAsyncClient, info, *args, **kwargs) # type: ignore + return UserLicenseServiceClient.from_service_account_info.__func__( + UserLicenseServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +140,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserLicenseServiceAsyncClient: The constructed client. """ - return UserLicenseServiceClient.from_service_account_file.__func__(UserLicenseServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return UserLicenseServiceClient.from_service_account_file.__func__( + UserLicenseServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -176,7 +180,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return UserLicenseServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return UserLicenseServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> UserLicenseServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py index 410ae1121a9c..83b82faddda8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1 import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,13 +63,12 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1.services.user_license_service import pagers +from google.cloud.discoveryengine_v1.types import user_license +from google.cloud.discoveryengine_v1.types import user_license_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1.services.user_license_service import pagers -from google.cloud.discoveryengine_v1.types import user_license, user_license_service - -from .transports.base import DEFAULT_CLIENT_INFO, UserLicenseServiceTransport +from .transports.base import UserLicenseServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import UserLicenseServiceGrpcTransport from .transports.grpc_asyncio import UserLicenseServiceGrpcAsyncIOTransport from .transports.rest import UserLicenseServiceRestTransport @@ -83,9 +82,7 @@ class UserLicenseServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserLicenseServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserLicenseServiceTransport]] _transport_registry["grpc"] = UserLicenseServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserLicenseServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserLicenseServiceRestTransport @@ -633,11 +630,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserLicenseServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserLicenseServiceClient._read_environment_variables() + ) self._client_cert_source = UserLicenseServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -672,8 +667,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserLicenseServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py index 5fbeea13004a..4f2335d6d979 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1.types import user_license, user_license_service +from google.cloud.discoveryengine_v1.types import user_license +from google.cloud.discoveryengine_v1.types import user_license_service class ListUserLicensesPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py index 39a4af2019a0..c9e4f4cdfbba 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/__init__.py @@ -19,12 +19,12 @@ from .base import UserLicenseServiceTransport from .grpc import UserLicenseServiceGrpcTransport from .grpc_asyncio import UserLicenseServiceGrpcAsyncIOTransport -from .rest import UserLicenseServiceRestInterceptor, UserLicenseServiceRestTransport +from .rest import UserLicenseServiceRestTransport +from .rest import UserLicenseServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[UserLicenseServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[UserLicenseServiceTransport]] _transport_registry["grpc"] = UserLicenseServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserLicenseServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserLicenseServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py index b2e631df6c2f..0d42a1364550 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/base.py @@ -16,19 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1 import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1 import gapic_version as package_version from google.cloud.discoveryengine_v1.types import user_license_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -221,7 +223,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py index 6623b0fe8af6..b15e0a7f1e49 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import user_license_service - -from .base import DEFAULT_CLIENT_INFO, UserLicenseServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import UserLicenseServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -392,12 +394,12 @@ def batch_update_user_licenses( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_user_licenses" not in self._stubs: - self._stubs[ - "batch_update_user_licenses" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", - request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["batch_update_user_licenses"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", + request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["batch_update_user_licenses"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py index b3d4161debc7..cda861c5471e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/grpc_asyncio.py @@ -15,27 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1.types import user_license_service - -from .base import DEFAULT_CLIENT_INFO, UserLicenseServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import UserLicenseServiceTransport, DEFAULT_CLIENT_INFO from .grpc import UserLicenseServiceGrpcTransport try: @@ -401,12 +403,12 @@ def batch_update_user_licenses( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_update_user_licenses" not in self._stubs: - self._stubs[ - "batch_update_user_licenses" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", - request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["batch_update_user_licenses"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1.UserLicenseService/BatchUpdateUserLicenses", + request_serializer=user_license_service.BatchUpdateUserLicensesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["batch_update_user_licenses"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py index dd67d173a26e..7c179a7b9ac4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest.py @@ -13,27 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1.types import user_license_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseUserLicenseServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -603,9 +610,7 @@ def __call__( """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseBatchUpdateUserLicenses._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseBatchUpdateUserLicenses._get_http_options() request, metadata = self._interceptor.pre_batch_update_user_licenses( request, metadata @@ -758,9 +763,7 @@ def __call__( """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseListUserLicenses._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseListUserLicenses._get_http_options() request, metadata = self._interceptor.pre_list_user_licenses( request, metadata @@ -860,7 +863,9 @@ def batch_update_user_licenses( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchUpdateUserLicenses(self._session, self._host, self._interceptor) # type: ignore + return self._BatchUpdateUserLicenses( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_user_licenses( @@ -929,9 +934,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1052,9 +1055,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseUserLicenseServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1193,9 +1194,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserLicenseServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserLicenseServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserLicenseServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest_base.py index 0d4ec4d25984..c60c75440c9e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/services/user_license_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import UserLicenseServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1.types import user_license_service - -from .base import DEFAULT_CLIENT_INFO, UserLicenseServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseUserLicenseServiceRestTransport(UserLicenseServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py index 839ab2e31bfc..11a53517c21b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/__init__.py @@ -13,15 +13,25 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .answer import Answer -from .assist_answer import AssistAnswer, AssistantContent, AssistantGroundedContent -from .assistant import Assistant +from .answer import ( + Answer, +) +from .assist_answer import ( + AssistAnswer, + AssistantContent, + AssistantGroundedContent, +) +from .assistant import ( + Assistant, +) from .assistant_service import ( AssistUserMetadata, StreamAssistRequest, StreamAssistResponse, ) -from .chunk import Chunk +from .chunk import ( + Chunk, +) from .cmek_config_service import ( CmekConfig, DeleteCmekConfigMetadata, @@ -37,19 +47,28 @@ CustomAttribute, DoubleList, HealthcareFhirConfig, - IndustryVertical, Interval, Principal, - SearchAddOn, SearchLinkPromotion, + UserInfo, + IndustryVertical, + SearchAddOn, SearchTier, SearchUseCase, SolutionType, - UserInfo, ) -from .completion import CompletionSuggestion, SuggestionDenyListEntry -from .completion_service import CompleteQueryRequest, CompleteQueryResponse -from .control import Condition, Control +from .completion import ( + CompletionSuggestion, + SuggestionDenyListEntry, +) +from .completion_service import ( + CompleteQueryRequest, + CompleteQueryResponse, +) +from .control import ( + Condition, + Control, +) from .control_service import ( CreateControlRequest, DeleteControlRequest, @@ -84,8 +103,14 @@ UpdateConversationRequest, UpdateSessionRequest, ) -from .custom_tuning_model import CustomTuningModel -from .data_store import AdvancedSiteSearchConfig, DataStore, WorkspaceConfig +from .custom_tuning_model import ( + CustomTuningModel, +) +from .data_store import ( + AdvancedSiteSearchConfig, + DataStore, + WorkspaceConfig, +) from .data_store_service import ( CreateDataStoreMetadata, CreateDataStoreRequest, @@ -96,8 +121,12 @@ ListDataStoresResponse, UpdateDataStoreRequest, ) -from .document import Document -from .document_processing_config import DocumentProcessingConfig +from .document import ( + Document, +) +from .document_processing_config import ( + DocumentProcessingConfig, +) from .document_service import ( BatchGetDocumentsMetadataRequest, BatchGetDocumentsMetadataResponse, @@ -108,7 +137,9 @@ ListDocumentsResponse, UpdateDocumentRequest, ) -from .engine import Engine +from .engine import ( + Engine, +) from .engine_service import ( CreateEngineMetadata, CreateEngineRequest, @@ -127,8 +158,14 @@ GenerateGroundedContentResponse, GroundedGenerationContent, ) -from .grounding import FactChunk, GroundingFact -from .identity_mapping_store import IdentityMappingEntry, IdentityMappingStore +from .grounding import ( + FactChunk, + GroundingFact, +) +from .identity_mapping_store import ( + IdentityMappingEntry, + IdentityMappingStore, +) from .identity_mapping_store_service import ( CreateIdentityMappingStoreRequest, DeleteIdentityMappingStoreMetadata, @@ -167,8 +204,13 @@ ImportUserEventsResponse, SpannerSource, ) -from .project import Project -from .project_service import ProvisionProjectMetadata, ProvisionProjectRequest +from .project import ( + Project, +) +from .project_service import ( + ProvisionProjectMetadata, + ProvisionProjectRequest, +) from .purge_config import ( PurgeCompletionSuggestionsMetadata, PurgeCompletionSuggestionsRequest, @@ -184,10 +226,22 @@ PurgeUserEventsRequest, PurgeUserEventsResponse, ) -from .rank_service import RankingRecord, RankRequest, RankResponse -from .recommendation_service import RecommendRequest, RecommendResponse -from .safety import HarmCategory, SafetyRating -from .schema import Schema +from .rank_service import ( + RankingRecord, + RankRequest, + RankResponse, +) +from .recommendation_service import ( + RecommendRequest, + RecommendResponse, +) +from .safety import ( + SafetyRating, + HarmCategory, +) +from .schema import ( + Schema, +) from .schema_service import ( CreateSchemaMetadata, CreateSchemaRequest, @@ -199,7 +253,10 @@ UpdateSchemaMetadata, UpdateSchemaRequest, ) -from .search_service import SearchRequest, SearchResponse +from .search_service import ( + SearchRequest, + SearchResponse, +) from .search_tuning_service import ( ListCustomModelsRequest, ListCustomModelsResponse, @@ -207,9 +264,16 @@ TrainCustomModelRequest, TrainCustomModelResponse, ) -from .serving_config import ServingConfig -from .serving_config_service import UpdateServingConfigRequest -from .session import Query, Session +from .serving_config import ( + ServingConfig, +) +from .serving_config_service import ( + UpdateServingConfigRequest, +) +from .session import ( + Query, + Session, +) from .site_search_engine import ( Sitemap, SiteSearchEngine, @@ -261,8 +325,13 @@ TransactionInfo, UserEvent, ) -from .user_event_service import CollectUserEventRequest, WriteUserEventRequest -from .user_license import UserLicense +from .user_event_service import ( + CollectUserEventRequest, + WriteUserEventRequest, +) +from .user_license import ( + UserLicense, +) from .user_license_service import ( BatchUpdateUserLicensesMetadata, BatchUpdateUserLicensesRequest, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py index 39c29ccfbabd..493c7410d30e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/answer.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import safety +from google.protobuf import struct_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -88,6 +89,7 @@ class State(proto.Enum): STREAMING (4): Answer generation is currently in progress. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -161,6 +163,7 @@ class AnswerSkippedReason(proto.Enum): is not answerable, the answer is not relevant to the query, or the answer is not well-formatted. """ + ANSWER_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_ANSWER_SEEKING_QUERY_IGNORED = 2 @@ -544,6 +547,7 @@ class State(proto.Enum): SUCCEEDED (3): Step has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -772,6 +776,7 @@ class Type(proto.Enum): USER_DEFINED_CLASSIFICATION_QUERY (5): User defined query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py index 3709ae87a66c..ae6e3f4d4cc3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assist_answer.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -63,6 +64,7 @@ class State(proto.Enum): SKIPPED (4): Assist operation has been skipped. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -84,6 +86,7 @@ class AssistSkippedReason(proto.Enum): (e.g., the query or the answer contained a banned phrase). """ + ASSIST_SKIPPED_REASON_UNSPECIFIED = 0 NON_ASSIST_SEEKING_QUERY_IGNORED = 1 CUSTOMER_POLICY_VIOLATION = 2 @@ -253,6 +256,7 @@ class Outcome(proto.Enum): cancelled. There may or may not be a partial output present. """ + OUTCOME_UNSPECIFIED = 0 OUTCOME_OK = 1 OUTCOME_FAILED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assistant.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assistant.py index 16f301e40e2c..f204df5ffdf3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assistant.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assistant.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assistant_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assistant_service.py index ccee1a3bff80..f2ddb772b23c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assistant_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/assistant_service.py @@ -19,9 +19,11 @@ import proto # type: ignore -from google.cloud.discoveryengine_v1.types import assist_answer, search_service +from google.cloud.discoveryengine_v1.types import assist_answer +from google.cloud.discoveryengine_v1.types import search_service from google.cloud.discoveryengine_v1.types import session as gcd_session + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py index c476c9ea4e8f..fbf6b6795333 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/chunk.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore +from google.protobuf import struct_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -92,6 +94,7 @@ class StructureType(proto.Enum): CHECKBOX_STRUCTURE (3): Checkbox structure. """ + STRUCTURE_TYPE_UNSPECIFIED = 0 SHAREHOLDER_STRUCTURE = 1 SIGNATURE_STRUCTURE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py index 378cd38ad0b7..d6fc4c03ef00 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/cmek_config_service.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -156,6 +158,7 @@ class State(proto.Enum): The KMS key is soft deleted. Some cleanup policy will eventually be applied. """ + STATE_UNSPECIFIED = 0 CREATING = 1 ACTIVE = 2 @@ -179,6 +182,7 @@ class NotebookLMState(proto.Enum): NOTEBOOK_LM_NOT_ENABLED (3): The NotebookLM is not enabled. """ + NOTEBOOK_LM_STATE_UNSPECIFIED = 0 NOTEBOOK_LM_NOT_READY = 1 NOTEBOOK_LM_READY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py index ee09c5fad591..cef3124914a4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/common.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -53,6 +54,7 @@ class IndustryVertical(proto.Enum): HEALTHCARE_FHIR (7): The healthcare FHIR vertical. """ + INDUSTRY_VERTICAL_UNSPECIFIED = 0 GENERIC = 1 MEDIA = 2 @@ -78,6 +80,7 @@ class SolutionType(proto.Enum): data stores must enrolled with ``SOLUTION_TYPE_CHAT`` solution. """ + SOLUTION_TYPE_UNSPECIFIED = 0 SOLUTION_TYPE_RECOMMENDATION = 1 SOLUTION_TYPE_SEARCH = 2 @@ -100,6 +103,7 @@ class SearchUseCase(proto.Enum): Browse use case. Expects the traffic has an empty [query][google.cloud.discoveryengine.v1.SearchRequest.query]. """ + SEARCH_USE_CASE_UNSPECIFIED = 0 SEARCH_USE_CASE_SEARCH = 1 SEARCH_USE_CASE_BROWSE = 2 @@ -119,6 +123,7 @@ class SearchTier(proto.Enum): SEARCH_TIER_ENTERPRISE (2): Enterprise tier. """ + SEARCH_TIER_UNSPECIFIED = 0 SEARCH_TIER_STANDARD = 1 SEARCH_TIER_ENTERPRISE = 2 @@ -134,6 +139,7 @@ class SearchAddOn(proto.Enum): SEARCH_ADD_ON_LLM (1): Large language model add-on. """ + SEARCH_ADD_ON_UNSPECIFIED = 0 SEARCH_ADD_ON_LLM = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py index f7f45960f38e..a60f40ec2d84 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -54,6 +55,7 @@ class MatchOperator(proto.Enum): CONTAINS (2): If the suggestion contains the block_phrase, then block it. """ + MATCH_OPERATOR_UNSPECIFIED = 0 EXACT_MATCH = 1 CONTAINS = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion_service.py index d4c75d5e46c4..b0a4964c8f2f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/completion_service.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -46,24 +47,24 @@ class CompleteQueryRequest(proto.Message): model specified in the Configuration > Autocomplete section of the Cloud console. Currently supported values: - - ``document`` - Using suggestions generated from - user-imported documents. - - ``search-history`` - Using suggestions generated from the - past history of - [SearchService.Search][google.cloud.discoveryengine.v1.SearchService.Search] - API calls. Do not use it when there is no traffic for - Search API. - - ``user-event`` - Using suggestions generated from - user-imported search events. - - ``document-completable`` - Using suggestions taken - directly from user-imported document fields marked as - completable. + - ``document`` - Using suggestions generated from + user-imported documents. + - ``search-history`` - Using suggestions generated from the + past history of + [SearchService.Search][google.cloud.discoveryengine.v1.SearchService.Search] + API calls. Do not use it when there is no traffic for + Search API. + - ``user-event`` - Using suggestions generated from + user-imported search events. + - ``document-completable`` - Using suggestions taken + directly from user-imported document fields marked as + completable. Default values: - - ``document`` is the default model for regular dataStores. - - ``search-history`` is the default model for site search - dataStores. + - ``document`` is the default model for regular dataStores. + - ``search-history`` is the default model for site search + dataStores. user_pseudo_id (str): A unique identifier for tracking visitors. For example, this could be implemented with an HTTP cookie, which should be diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py index 8d8b1e4a4bf0..e9d13f0ef8e6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import common +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -282,6 +283,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -298,6 +300,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control_service.py index b32fe3220982..0cb38d0b1e38 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/control_service.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import control as gcd_control +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -80,8 +81,8 @@ class UpdateControlRequest(proto.Message): [Control][google.cloud.discoveryengine.v1.Control] to update. The following are NOT supported: - - [Control.name][google.cloud.discoveryengine.v1.Control.name] - - [Control.solution_type][google.cloud.discoveryengine.v1.Control.solution_type] + - [Control.name][google.cloud.discoveryengine.v1.Control.name] + - [Control.solution_type][google.cloud.discoveryengine.v1.Control.solution_type] If not set or empty, all supported fields are updated. """ @@ -150,9 +151,9 @@ class ListControlsRequest(proto.Message): Optional. A filter to apply on the list results. Supported features: - - List all the products under the parent branch if - [filter][google.cloud.discoveryengine.v1.ListControlsRequest.filter] - is unset. Currently this field is unsupported. + - List all the products under the parent branch if + [filter][google.cloud.discoveryengine.v1.ListControlsRequest.filter] + is unset. Currently this field is unsupported. """ parent: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py index 45179ba30683..f8f3e975f068 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversation.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import search_service +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -68,6 +69,7 @@ class State(proto.Enum): COMPLETED (2): Conversation has been completed. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py index d12fbaea8277..9eb90135bdac 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/conversational_search_service.py @@ -17,13 +17,15 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1.types import answer as gcd_answer -from google.cloud.discoveryengine_v1.types import safety, search_service +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1.types import safety +from google.cloud.discoveryengine_v1.types import search_service from google.cloud.discoveryengine_v1.types import session as gcd_session +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -80,20 +82,20 @@ class ConverseConversationRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -197,12 +199,12 @@ class ConverseConversationResponse(proto.Message): number=2, message=gcd_conversation.Conversation, ) - search_results: MutableSequence[ - search_service.SearchResponse.SearchResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=search_service.SearchResponse.SearchResult, + search_results: MutableSequence[search_service.SearchResponse.SearchResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=search_service.SearchResponse.SearchResult, + ) ) @@ -239,7 +241,7 @@ class UpdateConversationRequest(proto.Message): [Conversation][google.cloud.discoveryengine.v1.Conversation] to update. The following are NOT supported: - - [Conversation.name][google.cloud.discoveryengine.v1.Conversation.name] + - [Conversation.name][google.cloud.discoveryengine.v1.Conversation.name] If not set or empty, all supported fields are updated. """ @@ -312,9 +314,9 @@ class ListConversationsRequest(proto.Message): ascending order. Use "desc" after a field name for descending. Supported fields: - - ``update_time`` - - ``create_time`` - - ``conversation_name`` + - ``update_time`` + - ``create_time`` + - ``conversation_name`` Example: "update_time desc" "create_time". """ @@ -435,20 +437,20 @@ class AnswerQueryRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -502,6 +504,7 @@ class HarmBlockThreshold(proto.Enum): OFF (5): Turn off the safety filter. """ + HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0 BLOCK_LOW_AND_ABOVE = 1 BLOCK_MEDIUM_AND_ABOVE = 2 @@ -573,6 +576,7 @@ class FilteringLevel(proto.Enum): FILTERING_LEVEL_HIGH (2): Filter answers based on a high threshold. """ + FILTERING_LEVEL_UNSPECIFIED = 0 FILTERING_LEVEL_LOW = 1 FILTERING_LEVEL_HIGH = 2 @@ -1095,6 +1099,7 @@ class Type(proto.Enum): USER_DEFINED_CLASSIFICATION_QUERY (5): User defined query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 @@ -1150,6 +1155,7 @@ class ModelType(proto.Enum): Large query rephraser model. Gemini 1.0 Pro model. """ + MODEL_TYPE_UNSPECIFIED = 0 SMALL = 1 LARGE = 2 @@ -1412,7 +1418,7 @@ class UpdateSessionRequest(proto.Message): [Session][google.cloud.discoveryengine.v1.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1.Session.name] + - [Session.name][google.cloud.discoveryengine.v1.Session.name] If not set or empty, all supported fields are updated. """ @@ -1485,14 +1491,14 @@ class ListSessionsRequest(proto.Message): A comma-separated list of fields to filter by, in EBNF grammar. The supported fields are: - - ``user_pseudo_id`` - - ``state`` - - ``display_name`` - - ``starred`` - - ``is_pinned`` - - ``labels`` - - ``create_time`` - - ``update_time`` + - ``user_pseudo_id`` + - ``state`` + - ``display_name`` + - ``starred`` + - ``is_pinned`` + - ``labels`` + - ``create_time`` + - ``update_time`` Examples: "user_pseudo_id = some_id" "display_name = "some_name"" "starred = true" "is_pinned=true AND (NOT @@ -1502,17 +1508,17 @@ class ListSessionsRequest(proto.Message): ascending order. Use "desc" after a field name for descending. Supported fields: - - ``update_time`` - - ``create_time`` - - ``session_name`` - - ``is_pinned`` + - ``update_time`` + - ``create_time`` + - ``session_name`` + - ``is_pinned`` Example: - - "update_time desc" - - "create_time" - - "is_pinned desc,update_time desc": list sessions by - is_pinned first, then by update_time. + - "update_time desc" + - "create_time" + - "is_pinned desc,update_time desc": list sessions by + is_pinned first, then by update_time. """ parent: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py index d4eacc8b57c8..92076f07c356 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/custom_tuning_model.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -83,6 +85,7 @@ class ModelState(proto.Enum): Input data validation failed. Model training didn't start. """ + MODEL_STATE_UNSPECIFIED = 0 TRAINING_PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py index 397e4dce92ba..c3fa1ad63105 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store.py @@ -17,14 +17,16 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1.types import cmek_config_service +from google.cloud.discoveryengine_v1.types import common from google.cloud.discoveryengine_v1.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common from google.cloud.discoveryengine_v1.types import schema +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -62,10 +64,11 @@ class DataStore(proto.Message): solutions for each [industry_vertical][google.cloud.discoveryengine.v1.DataStore.industry_vertical]: - - ``MEDIA``: ``SOLUTION_TYPE_RECOMMENDATION`` and - ``SOLUTION_TYPE_SEARCH``. - - ``SITE_SEARCH``: ``SOLUTION_TYPE_SEARCH`` is automatically - enrolled. Other solutions cannot be enrolled. + - ``MEDIA``: ``SOLUTION_TYPE_RECOMMENDATION`` and + ``SOLUTION_TYPE_SEARCH``. + - ``SITE_SEARCH``: ``SOLUTION_TYPE_SEARCH`` is + automatically enrolled. Other solutions cannot be + enrolled. default_schema_id (str): Output only. The id of the default [Schema][google.cloud.discoveryengine.v1.Schema] associated @@ -174,6 +177,7 @@ class ContentConfig(proto.Enum): workspace data store are specified in the [WorkspaceConfig][google.cloud.discoveryengine.v1.WorkspaceConfig]. """ + CONTENT_CONFIG_UNSPECIFIED = 0 NO_CONTENT = 1 CONTENT_REQUIRED = 2 @@ -384,6 +388,7 @@ class Type(proto.Enum): GOOGLE_PEOPLE (8): Workspace Data Store contains People data """ + TYPE_UNSPECIFIED = 0 GOOGLE_DRIVE = 1 GOOGLE_MAIL = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store_service.py index 6415db9c91d7..475a252458c6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/data_store_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py index aa775043afc9..f5c67545a562 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + +from google.cloud.discoveryengine_v1.types import common from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import common __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -99,12 +100,12 @@ class Document(proto.Message): index_status (google.cloud.discoveryengine_v1.types.Document.IndexStatus): Output only. The index status of the document. - - If document is indexed successfully, the index_time field - is populated. - - Otherwise, if document is not indexed due to errors, the - error_samples field is populated. - - Otherwise, if document's index is in progress, the - pending_message field is populated. + - If document is indexed successfully, the index_time field + is populated. + - Otherwise, if document is not indexed due to errors, the + error_samples field is populated. + - Otherwise, if document's index is in progress, the + pending_message field is populated. """ class Content(proto.Message): @@ -140,28 +141,28 @@ class Content(proto.Message): mime_type (str): The MIME type of the content. Supported types: - - ``application/pdf`` (PDF, only native PDFs are supported - for now) - - ``text/html`` (HTML) - - ``text/plain`` (TXT) - - ``application/xml`` or ``text/xml`` (XML) - - ``application/json`` (JSON) - - ``application/vnd.openxmlformats-officedocument.wordprocessingml.document`` - (DOCX) - - ``application/vnd.openxmlformats-officedocument.presentationml.presentation`` - (PPTX) - - ``application/vnd.openxmlformats-officedocument.spreadsheetml.sheet`` - (XLSX) - - ``application/vnd.ms-excel.sheet.macroenabled.12`` (XLSM) + - ``application/pdf`` (PDF, only native PDFs are supported + for now) + - ``text/html`` (HTML) + - ``text/plain`` (TXT) + - ``application/xml`` or ``text/xml`` (XML) + - ``application/json`` (JSON) + - ``application/vnd.openxmlformats-officedocument.wordprocessingml.document`` + (DOCX) + - ``application/vnd.openxmlformats-officedocument.presentationml.presentation`` + (PPTX) + - ``application/vnd.openxmlformats-officedocument.spreadsheetml.sheet`` + (XLSX) + - ``application/vnd.ms-excel.sheet.macroenabled.12`` (XLSM) The following types are supported only if layout parser is enabled in the data store: - - ``image/bmp`` (BMP) - - ``image/gif`` (GIF) - - ``image/jpeg`` (JPEG) - - ``image/png`` (PNG) - - ``image/tiff`` (TIFF) + - ``image/bmp`` (BMP) + - ``image/gif`` (GIF) + - ``image/jpeg`` (JPEG) + - ``image/png`` (PNG) + - ``image/tiff`` (TIFF) See https://www.iana.org/assignments/media-types/media-types.xhtml. @@ -226,12 +227,12 @@ class AccessRestriction(proto.Message): number=2, ) - readers: MutableSequence[ - "Document.AclInfo.AccessRestriction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.AclInfo.AccessRestriction", + readers: MutableSequence["Document.AclInfo.AccessRestriction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.AclInfo.AccessRestriction", + ) ) class IndexStatus(proto.Message): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_processing_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_processing_config.py index 319afeb26b8d..26b895121053 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_processing_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_processing_config.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -53,19 +54,19 @@ class DocumentProcessingConfig(proto.Message): Map from file type to override the default parsing configuration based on the file type. Supported keys: - - ``pdf``: Override parsing config for PDF files, either - digital parsing, ocr parsing or layout parsing is - supported. - - ``html``: Override parsing config for HTML files, only - digital parsing and layout parsing are supported. - - ``docx``: Override parsing config for DOCX files, only - digital parsing and layout parsing are supported. - - ``pptx``: Override parsing config for PPTX files, only - digital parsing and layout parsing are supported. - - ``xlsm``: Override parsing config for XLSM files, only - digital parsing and layout parsing are supported. - - ``xlsx``: Override parsing config for XLSX files, only - digital parsing and layout parsing are supported. + - ``pdf``: Override parsing config for PDF files, either + digital parsing, ocr parsing or layout parsing is + supported. + - ``html``: Override parsing config for HTML files, only + digital parsing and layout parsing are supported. + - ``docx``: Override parsing config for DOCX files, only + digital parsing and layout parsing are supported. + - ``pptx``: Override parsing config for PPTX files, only + digital parsing and layout parsing are supported. + - ``xlsm``: Override parsing config for XLSM files, only + digital parsing and layout parsing are supported. + - ``xlsx``: Override parsing config for XLSX files, only + digital parsing and layout parsing are supported. """ class ChunkingConfig(proto.Message): @@ -179,7 +180,7 @@ class LayoutParsingConfig(proto.Message): Optional. Contains the required structure types to extract from the document. Supported values: - - ``shareholder-structure`` + - ``shareholder-structure`` exclude_html_elements (MutableSequence[str]): Optional. List of HTML elements to exclude from the parsed content. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py index 6a4718de16f0..86428fcc0ebc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/document_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import document as gcd_document +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -391,6 +392,7 @@ class State(proto.Enum): The [Document][google.cloud.discoveryengine.v1.Document] is not indexed. """ + STATE_UNSPECIFIED = 0 INDEXED = 1 NOT_IN_TARGET_SITE = 2 @@ -416,10 +418,10 @@ class DocumentMetadata(proto.Message): Allowed values are: - - ``batch``: Data ingested via Batch API, e.g., - ImportDocuments. - - ``streaming`` Data ingested via Streaming API, e.g., FHIR - streaming. + - ``batch``: Data ingested via Batch API, e.g., + ImportDocuments. + - ``streaming`` Data ingested via Streaming API, e.g., FHIR + streaming. """ class MatcherValue(proto.Message): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py index 6269a62ef070..91e1b5c1c55b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import common +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -229,6 +230,7 @@ class TrainingState(proto.Enum): TRAINING (2): The engine is training. """ + TRAINING_STATE_UNSPECIFIED = 0 PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine_service.py index 484dbbcd23e3..bda9bc1bce32 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/engine_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import engine as gcd_engine +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py index 31c733582e6a..c66b6a0ad47e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounded_generation_service.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1.types import grounding + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -108,20 +109,20 @@ class GenerateGroundedContentRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -258,6 +259,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 @@ -325,12 +327,12 @@ class InlineSource(proto.Message): author of the content). """ - grounding_facts: MutableSequence[ - grounding.GroundingFact - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=grounding.GroundingFact, + grounding_facts: MutableSequence[grounding.GroundingFact] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=grounding.GroundingFact, + ) ) attributes: MutableMapping[str, str] = proto.MapField( proto.STRING, @@ -558,6 +560,7 @@ class Source(proto.Enum): GOOGLE_MAPS (4): Google Maps. """ + SOURCE_UNSPECIFIED = 0 VERTEX_AI_SEARCH = 1 GOOGLE_SEARCH = 3 @@ -620,6 +623,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 @@ -882,20 +886,20 @@ class CheckGroundingRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounding.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounding.py index 8fa92a7cdabd..e7d5dc3bd0b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounding.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/grounding.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store.py index 9d8d066786de..311b1073eab2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1.types import cmek_config_service + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store_service.py index 1cce182f70d0..614f02447567 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/identity_mapping_store_service.py @@ -17,13 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) +from google.protobuf import timestamp_pb2 # type: ignore +from google.rpc import status_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -229,17 +230,17 @@ class PurgeIdentityMappingsRequest(proto.Message): Filter matching identity mappings to purge. The eligible field for filtering is: - - ``update_time``: in ISO 8601 "zulu" format. - - ``external_id`` + - ``update_time``: in ISO 8601 "zulu" format. + - ``external_id`` Examples: - - Deleting all identity mappings updated in a time range: - ``update_time > "2012-04-23T18:25:43.511Z" AND update_time < "2012-04-23T18:30:43.511Z"`` - - Deleting all identity mappings for a given external_id: - ``external_id = "id1"`` - - Deleting all identity mappings inside an identity mapping - store: ``*`` + - Deleting all identity mappings updated in a time range: + ``update_time > "2012-04-23T18:25:43.511Z" AND update_time < "2012-04-23T18:30:43.511Z"`` + - Deleting all identity mappings for a given external_id: + ``external_id = "id1"`` + - Deleting all identity mappings inside an identity mapping + store: ``*`` The filtering fields are assumed to have an implicit AND. Should not be used with source. An error will be thrown, if diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py index 8aa69e0939e7..5565ab28551e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/import_config.py @@ -17,13 +17,16 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + +from google.cloud.discoveryengine_v1.types import completion +from google.cloud.discoveryengine_v1.types import document +from google.cloud.discoveryengine_v1.types import user_event from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore from google.type import date_pb2 # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import completion, document, user_event __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -73,30 +76,30 @@ class GcsSource(proto.Message): Supported values for document imports: - - ``document`` (default): One JSON - [Document][google.cloud.discoveryengine.v1.Document] per - line. Each document must have a valid - [Document.id][google.cloud.discoveryengine.v1.Document.id]. - - ``content``: Unstructured data (e.g. PDF, HTML). Each file - matched by ``input_uris`` becomes a document, with the ID - set to the first 128 bits of SHA256(URI) encoded as a hex - string. - - ``custom``: One custom data JSON per row in arbitrary - format that conforms to the defined - [Schema][google.cloud.discoveryengine.v1.Schema] of the - data store. This can only be used by the GENERIC Data - Store vertical. - - ``csv``: A CSV file with header conforming to the defined - [Schema][google.cloud.discoveryengine.v1.Schema] of the - data store. Each entry after the header is imported as a - Document. This can only be used by the GENERIC Data Store - vertical. + - ``document`` (default): One JSON + [Document][google.cloud.discoveryengine.v1.Document] per + line. Each document must have a valid + [Document.id][google.cloud.discoveryengine.v1.Document.id]. + - ``content``: Unstructured data (e.g. PDF, HTML). Each + file matched by ``input_uris`` becomes a document, with + the ID set to the first 128 bits of SHA256(URI) encoded + as a hex string. + - ``custom``: One custom data JSON per row in arbitrary + format that conforms to the defined + [Schema][google.cloud.discoveryengine.v1.Schema] of the + data store. This can only be used by the GENERIC Data + Store vertical. + - ``csv``: A CSV file with header conforming to the defined + [Schema][google.cloud.discoveryengine.v1.Schema] of the + data store. Each entry after the header is imported as a + Document. This can only be used by the GENERIC Data Store + vertical. Supported values for user event imports: - - ``user_event`` (default): One JSON - [UserEvent][google.cloud.discoveryengine.v1.UserEvent] per - line. + - ``user_event`` (default): One JSON + [UserEvent][google.cloud.discoveryengine.v1.UserEvent] + per line. """ input_uris: MutableSequence[str] = proto.RepeatedField( @@ -143,25 +146,25 @@ class BigQuerySource(proto.Message): Supported values for user event imports: - - ``user_event`` (default): One - [UserEvent][google.cloud.discoveryengine.v1.UserEvent] per - row. + - ``user_event`` (default): One + [UserEvent][google.cloud.discoveryengine.v1.UserEvent] + per row. Supported values for document imports: - - ``document`` (default): One - [Document][google.cloud.discoveryengine.v1.Document] - format per row. Each document must have a valid - [Document.id][google.cloud.discoveryengine.v1.Document.id] - and one of - [Document.json_data][google.cloud.discoveryengine.v1.Document.json_data] - or - [Document.struct_data][google.cloud.discoveryengine.v1.Document.struct_data]. - - ``custom``: One custom data per row in arbitrary format - that conforms to the defined - [Schema][google.cloud.discoveryengine.v1.Schema] of the - data store. This can only be used by the GENERIC Data - Store vertical. + - ``document`` (default): One + [Document][google.cloud.discoveryengine.v1.Document] + format per row. Each document must have a valid + [Document.id][google.cloud.discoveryengine.v1.Document.id] + and one of + [Document.json_data][google.cloud.discoveryengine.v1.Document.json_data] + or + [Document.struct_data][google.cloud.discoveryengine.v1.Document.struct_data]. + - ``custom``: One custom data per row in arbitrary format + that conforms to the defined + [Schema][google.cloud.discoveryengine.v1.Schema] of the + data store. This can only be used by the GENERIC Data + Store vertical. """ partition_date: date_pb2.Date = proto.Field( @@ -278,6 +281,7 @@ class Type(proto.Enum): JSON (7): JSON type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -298,6 +302,7 @@ class Encoding(proto.Enum): BINARY (2): Binary encoding. """ + ENCODING_UNSPECIFIED = 0 TEXT = 1 BINARY = 2 @@ -317,11 +322,11 @@ class BigtableColumnFamily(proto.Message): The encoding mode of the values when the type is not STRING. Acceptable encoding values are: - - ``TEXT``: indicates values are alphanumeric text strings. - - ``BINARY``: indicates values are encoded using - ``HBase Bytes.toBytes`` family of functions. This can be - overridden for a specific column by listing that column in - ``columns`` and specifying an encoding for it. + - ``TEXT``: indicates values are alphanumeric text strings. + - ``BINARY``: indicates values are encoded using + ``HBase Bytes.toBytes`` family of functions. This can be + overridden for a specific column by listing that column + in ``columns`` and specifying an encoding for it. type_ (google.cloud.discoveryengine_v1.types.BigtableOptions.Type): The type of values in this column family. The values are expected to be encoded using ``HBase Bytes.toBytes`` @@ -346,12 +351,12 @@ class BigtableColumnFamily(proto.Message): number=3, enum="BigtableOptions.Type", ) - columns: MutableSequence[ - "BigtableOptions.BigtableColumn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BigtableOptions.BigtableColumn", + columns: MutableSequence["BigtableOptions.BigtableColumn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BigtableOptions.BigtableColumn", + ) ) class BigtableColumn(proto.Message): @@ -373,11 +378,11 @@ class BigtableColumn(proto.Message): The encoding mode of the values when the type is not ``STRING``. Acceptable encoding values are: - - ``TEXT``: indicates values are alphanumeric text strings. - - ``BINARY``: indicates values are encoded using - ``HBase Bytes.toBytes`` family of functions. This can be - overridden for a specific column by listing that column in - ``columns`` and specifying an encoding for it. + - ``TEXT``: indicates values are alphanumeric text strings. + - ``BINARY``: indicates values are encoded using + ``HBase Bytes.toBytes`` family of functions. This can be + overridden for a specific column by listing that column + in ``columns`` and specifying an encoding for it. type_ (google.cloud.discoveryengine_v1.types.BigtableOptions.Type): The type of values in this column family. The values are expected to be encoded using ``HBase Bytes.toBytes`` @@ -979,18 +984,18 @@ class ImportDocumentsRequest(proto.Message): Supported data sources: - - [GcsSource][google.cloud.discoveryengine.v1.GcsSource]. - [GcsSource.data_schema][google.cloud.discoveryengine.v1.GcsSource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [BigQuerySource][google.cloud.discoveryengine.v1.BigQuerySource]. - [BigQuerySource.data_schema][google.cloud.discoveryengine.v1.BigQuerySource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [SpannerSource][google.cloud.discoveryengine.v1.SpannerSource]. - - [CloudSqlSource][google.cloud.discoveryengine.v1.CloudSqlSource]. - - [FirestoreSource][google.cloud.discoveryengine.v1.FirestoreSource]. - - [BigtableSource][google.cloud.discoveryengine.v1.BigtableSource]. + - [GcsSource][google.cloud.discoveryengine.v1.GcsSource]. + [GcsSource.data_schema][google.cloud.discoveryengine.v1.GcsSource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [BigQuerySource][google.cloud.discoveryengine.v1.BigQuerySource]. + [BigQuerySource.data_schema][google.cloud.discoveryengine.v1.BigQuerySource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [SpannerSource][google.cloud.discoveryengine.v1.SpannerSource]. + - [CloudSqlSource][google.cloud.discoveryengine.v1.CloudSqlSource]. + - [FirestoreSource][google.cloud.discoveryengine.v1.FirestoreSource]. + - [BigtableSource][google.cloud.discoveryengine.v1.BigtableSource]. id_field (str): The field indicates the ID field or column to be used as unique IDs of the documents. @@ -1019,18 +1024,18 @@ class ImportDocumentsRequest(proto.Message): Supported data sources: - - [GcsSource][google.cloud.discoveryengine.v1.GcsSource]. - [GcsSource.data_schema][google.cloud.discoveryengine.v1.GcsSource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [BigQuerySource][google.cloud.discoveryengine.v1.BigQuerySource]. - [BigQuerySource.data_schema][google.cloud.discoveryengine.v1.BigQuerySource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [SpannerSource][google.cloud.discoveryengine.v1.SpannerSource]. - - [CloudSqlSource][google.cloud.discoveryengine.v1.CloudSqlSource]. - - [FirestoreSource][google.cloud.discoveryengine.v1.FirestoreSource]. - - [BigtableSource][google.cloud.discoveryengine.v1.BigtableSource]. + - [GcsSource][google.cloud.discoveryengine.v1.GcsSource]. + [GcsSource.data_schema][google.cloud.discoveryengine.v1.GcsSource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [BigQuerySource][google.cloud.discoveryengine.v1.BigQuerySource]. + [BigQuerySource.data_schema][google.cloud.discoveryengine.v1.BigQuerySource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [SpannerSource][google.cloud.discoveryengine.v1.SpannerSource]. + - [CloudSqlSource][google.cloud.discoveryengine.v1.CloudSqlSource]. + - [FirestoreSource][google.cloud.discoveryengine.v1.FirestoreSource]. + - [BigtableSource][google.cloud.discoveryengine.v1.BigtableSource]. force_refresh_content (bool): Optional. Whether to force refresh the unstructured content of the documents. @@ -1056,6 +1061,7 @@ class ReconciliationMode(proto.Enum): deleted if they are not present in the source location. """ + RECONCILIATION_MODE_UNSPECIFIED = 0 INCREMENTAL = 1 FULL = 2 @@ -1218,8 +1224,8 @@ class ImportSuggestionDenyListEntriesRequest(proto.Message): import. Supported values ``gcs_source.schema`` for autocomplete suggestion deny list entry imports: - - ``suggestion_deny_list`` (default): One JSON - [SuggestionDenyListEntry] per line. + - ``suggestion_deny_list`` (default): One JSON + [SuggestionDenyListEntry] per line. This field is a member of `oneof`_ ``source``. parent (str): @@ -1237,12 +1243,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - entries: MutableSequence[ - completion.SuggestionDenyListEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.SuggestionDenyListEntry, + entries: MutableSequence[completion.SuggestionDenyListEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.SuggestionDenyListEntry, + ) ) inline_source: InlineSource = proto.Field( @@ -1365,12 +1371,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - suggestions: MutableSequence[ - completion.CompletionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.CompletionSuggestion, + suggestions: MutableSequence[completion.CompletionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.CompletionSuggestion, + ) ) inline_source: InlineSource = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py index 23ec2dc21bae..f901376b3bbc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -60,11 +62,11 @@ class ServiceTerms(proto.Message): The unique identifier of this terms of service. Available terms: - - ``GA_DATA_USE_TERMS``: `Terms for data - use `__. - When using this as ``id``, the acceptable - [version][google.cloud.discoveryengine.v1.Project.ServiceTerms.version] - to provide is ``2022-11-23``. + - ``GA_DATA_USE_TERMS``: `Terms for data + use `__. + When using this as ``id``, the acceptable + [version][google.cloud.discoveryengine.v1.Project.ServiceTerms.version] + to provide is ``2022-11-23``. version (str): The version string of the terms of service. For acceptable values, see the comments for @@ -98,6 +100,7 @@ class State(proto.Enum): The project has declined or revoked the agreement to terms of service. """ + STATE_UNSPECIFIED = 0 TERMS_ACCEPTED = 1 TERMS_PENDING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project_service.py index 77670cbe94f3..511d8935b370 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/project_service.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/purge_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/purge_config.py index 74cbdd1f53f1..5094d0ed66e0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/purge_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/purge_config.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import import_config +from google.protobuf import timestamp_pb2 # type: ignore +from google.rpc import status_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -56,28 +57,28 @@ class PurgeUserEventsRequest(proto.Message): deleted with a length limit of 5,000 characters. The eligible fields for filtering are: - - ``eventType``: Double quoted - [UserEvent.event_type][google.cloud.discoveryengine.v1.UserEvent.event_type] - string. - - ``eventTime``: in ISO 8601 "zulu" format. - - ``userPseudoId``: Double quoted string. Specifying this - will delete all events associated with a visitor. - - ``userId``: Double quoted string. Specifying this will - delete all events associated with a user. + - ``eventType``: Double quoted + [UserEvent.event_type][google.cloud.discoveryengine.v1.UserEvent.event_type] + string. + - ``eventTime``: in ISO 8601 "zulu" format. + - ``userPseudoId``: Double quoted string. Specifying this + will delete all events associated with a visitor. + - ``userId``: Double quoted string. Specifying this will + delete all events associated with a user. Note: This API only supports purging a max range of 30 days. Examples: - - Deleting all events in a time range: - ``eventTime > "2012-04-23T18:25:43.511Z" eventTime < "2012-04-23T18:30:43.511Z"`` - - Deleting specific eventType in a time range: - ``eventTime > "2012-04-23T18:25:43.511Z" eventTime < "2012-04-23T18:30:43.511Z" eventType = "search"`` - - Deleting all events for a specific visitor in a time - range: - ``eventTime > "2012-04-23T18:25:43.511Z" eventTime < "2012-04-23T18:30:43.511Z" userPseudoId = "visitor1024"`` - - Deleting the past 30 days of events inside a DataStore: - ``*`` + - Deleting all events in a time range: + ``eventTime > "2012-04-23T18:25:43.511Z" eventTime < "2012-04-23T18:30:43.511Z"`` + - Deleting specific eventType in a time range: + ``eventTime > "2012-04-23T18:25:43.511Z" eventTime < "2012-04-23T18:30:43.511Z" eventType = "search"`` + - Deleting all events for a specific visitor in a time + range: + ``eventTime > "2012-04-23T18:25:43.511Z" eventTime < "2012-04-23T18:30:43.511Z" userPseudoId = "visitor1024"`` + - Deleting the past 30 days of events inside a DataStore: + ``*`` The filtering fields are assumed to have an implicit AND. force (bool): @@ -198,9 +199,9 @@ class PurgeDocumentsRequest(proto.Message): Cloud Storage location for the input content. Supported ``data_schema``: - - ``document_id``: One valid - [Document.id][google.cloud.discoveryengine.v1.Document.id] - per line. + - ``document_id``: One valid + [Document.id][google.cloud.discoveryengine.v1.Document.id] + per line. This field is a member of `oneof`_ ``source``. inline_source (google.cloud.discoveryengine_v1.types.PurgeDocumentsRequest.InlineSource): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/rank_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/rank_service.py index 523aabfa5335..eb54787486ef 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/rank_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/rank_service.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -88,8 +89,8 @@ class RankRequest(proto.Message): model (str): The identifier of the model to use. It is one of: - - ``semantic-ranker-512@latest``: Semantic ranking model - with maximum input token size 512. + - ``semantic-ranker-512@latest``: Semantic ranking model + with maximum input token size 512. It is set to ``semantic-ranker-512@latest`` by default if unspecified. @@ -110,20 +111,20 @@ class RankRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/recommendation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/recommendation_service.py index aa40514fe133..25c3f7606465 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/recommendation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/recommendation_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import document as gcd_document from google.cloud.discoveryengine_v1.types import user_event as gcd_user_event +from google.protobuf import struct_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -84,18 +85,18 @@ class RecommendRequest(proto.Message): Examples: - - ``(filter_tags: ANY("Red", "Blue") OR filter_tags: ANY("Hot", "Cold"))`` - - ``(filter_tags: ANY("Red", "Blue")) AND NOT (filter_tags: ANY("Green"))`` + - ``(filter_tags: ANY("Red", "Blue") OR filter_tags: ANY("Hot", "Cold"))`` + - ``(filter_tags: ANY("Red", "Blue")) AND NOT (filter_tags: ANY("Green"))`` If ``attributeFilteringSyntax`` is set to true under the ``params`` field, then attribute-based expressions are expected instead of the above described tag-based syntax. Examples: - - (language: ANY("en", "es")) AND NOT (categories: - ANY("Movie")) - - (available: true) AND (language: ANY("en", "es")) OR - (categories: ANY("Movie")) + - (language: ANY("en", "es")) AND NOT (categories: + ANY("Movie")) + - (available: true) AND (language: ANY("en", "es")) OR + (categories: ANY("Movie")) If your filter blocks all results, the API returns generic (unfiltered) popular Documents. If you only want results @@ -119,51 +120,51 @@ class RecommendRequest(proto.Message): Allowed values: - - ``returnDocument``: Boolean. If set to ``true``, the - associated Document object is returned in - [RecommendResponse.RecommendationResult.document][google.cloud.discoveryengine.v1.RecommendResponse.RecommendationResult.document]. - - ``returnScore``: Boolean. If set to true, the - recommendation score corresponding to each returned - Document is set in - [RecommendResponse.RecommendationResult.metadata][google.cloud.discoveryengine.v1.RecommendResponse.RecommendationResult.metadata]. - The given score indicates the probability of a Document - conversion given the user's context and history. - - ``strictFiltering``: Boolean. True by default. If set to - ``false``, the service returns generic (unfiltered) - popular Documents instead of empty if your filter blocks - all recommendation results. - - ``diversityLevel``: String. Default empty. If set to be - non-empty, then it needs to be one of: - - - ``no-diversity`` - - ``low-diversity`` - - ``medium-diversity`` - - ``high-diversity`` - - ``auto-diversity`` This gives request-level control and - adjusts recommendation results based on Document - category. - - - ``attributeFilteringSyntax``: Boolean. False by default. - If set to true, the ``filter`` field is interpreted - according to the new, attribute-based syntax. + - ``returnDocument``: Boolean. If set to ``true``, the + associated Document object is returned in + [RecommendResponse.RecommendationResult.document][google.cloud.discoveryengine.v1.RecommendResponse.RecommendationResult.document]. + - ``returnScore``: Boolean. If set to true, the + recommendation score corresponding to each returned + Document is set in + [RecommendResponse.RecommendationResult.metadata][google.cloud.discoveryengine.v1.RecommendResponse.RecommendationResult.metadata]. + The given score indicates the probability of a Document + conversion given the user's context and history. + - ``strictFiltering``: Boolean. True by default. If set to + ``false``, the service returns generic (unfiltered) + popular Documents instead of empty if your filter blocks + all recommendation results. + - ``diversityLevel``: String. Default empty. If set to be + non-empty, then it needs to be one of: + + - ``no-diversity`` + - ``low-diversity`` + - ``medium-diversity`` + - ``high-diversity`` + - ``auto-diversity`` This gives request-level control + and adjusts recommendation results based on Document + category. + + - ``attributeFilteringSyntax``: Boolean. False by default. + If set to true, the ``filter`` field is interpreted + according to the new, attribute-based syntax. user_labels (MutableMapping[str, str]): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Requirements for labels `__ @@ -242,9 +243,9 @@ class RecommendationResult(proto.Message): Possible values: - - ``score``: Recommendation score in double value. Is set if - ``returnScore`` is set to true in - [RecommendRequest.params][google.cloud.discoveryengine.v1.RecommendRequest.params]. + - ``score``: Recommendation score in double value. Is set + if ``returnScore`` is set to true in + [RecommendRequest.params][google.cloud.discoveryengine.v1.RecommendRequest.params]. """ id: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py index 19274c56b9f2..e95d9224b3b8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/safety.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -46,6 +47,7 @@ class HarmCategory(proto.Enum): HARM_CATEGORY_CIVIC_INTEGRITY (5): The harm category is civic integrity. """ + HARM_CATEGORY_UNSPECIFIED = 0 HARM_CATEGORY_HATE_SPEECH = 1 HARM_CATEGORY_DANGEROUS_CONTENT = 2 @@ -90,6 +92,7 @@ class HarmProbability(proto.Enum): HIGH (4): High level of harm. """ + HARM_PROBABILITY_UNSPECIFIED = 0 NEGLIGIBLE = 1 LOW = 2 @@ -111,6 +114,7 @@ class HarmSeverity(proto.Enum): HARM_SEVERITY_HIGH (4): High level of harm severity. """ + HARM_SEVERITY_UNSPECIFIED = 0 HARM_SEVERITY_NEGLIGIBLE = 1 HARM_SEVERITY_LOW = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema.py index 18e6d43e0a35..027fd93e3667 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore +from google.protobuf import struct_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema_service.py index a54f02bcbd97..67562aae857f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/schema_service.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import schema as gcd_schema +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py index 0bbbbac3121a..d40abd0c007e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_service.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import chunk as gcd_chunk from google.cloud.discoveryengine_v1.types import common from google.cloud.discoveryengine_v1.types import document as gcd_document +from google.protobuf import struct_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -64,11 +65,11 @@ class SearchRequest(proto.Message): Values above the maximum value are coerced to the maximum value. - - Websites with basic indexing: Default ``10``, Maximum - ``25``. - - Websites with advanced indexing: Default ``25``, Maximum - ``50``. - - Other: Default ``50``, Maximum ``100``. + - Websites with basic indexing: Default ``10``, Maximum + ``25``. + - Websites with advanced indexing: Default ``25``, Maximum + ``50``. + - Other: Default ``50``, Maximum ``100``. If this field is negative, an ``INVALID_ARGUMENT`` is returned. @@ -181,18 +182,18 @@ class SearchRequest(proto.Message): For public website search only, supported values are: - - ``user_country_code``: string. Default empty. If set to - non-empty, results are restricted or boosted based on the - location provided. For example, - ``user_country_code: "au"`` + - ``user_country_code``: string. Default empty. If set to + non-empty, results are restricted or boosted based on the + location provided. For example, + ``user_country_code: "au"`` - For available codes see `Country - Codes `__ + For available codes see `Country + Codes `__ - - ``search_type``: double. Default empty. Enables - non-webpage searching depending on the value. The only - valid non-default value is 1, which enables image - searching. For example, ``search_type: 1`` + - ``search_type``: double. Default empty. Enables + non-webpage searching depending on the value. The only + valid non-default value is 1, which enables image + searching. For example, ``search_type: 1`` query_expansion_spec (google.cloud.discoveryengine_v1.types.SearchRequest.QueryExpansionSpec): The query expansion specification that specifies the conditions under which query @@ -229,20 +230,20 @@ class SearchRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -316,21 +317,21 @@ class SearchRequest(proto.Message): be a single function or multiple functions that are joined by "+". - - ranking_expression = function, { " + ", function }; + - ranking_expression = function, { " + ", function }; Supported functions: - - double \* relevance_score - - double \* dotProduct(embedding_field_path) + - double \* relevance_score + - double \* dotProduct(embedding_field_path) Function variables: - - ``relevance_score``: pre-defined keywords, used for - measure relevance between query and document. - - ``embedding_field_path``: the document embedding field - used with query embedding vector. - - ``dotProduct``: embedding function between - ``embedding_field_path`` and query embedding vector. + - ``relevance_score``: pre-defined keywords, used for + measure relevance between query and document. + - ``embedding_field_path``: the document embedding field + used with query embedding vector. + - ``dotProduct``: embedding function between + ``embedding_field_path`` and query embedding vector. Example ranking expression: @@ -344,66 +345,68 @@ class SearchRequest(proto.Message): is set to ``RANK_BY_FORMULA``, the following expression types (and combinations of those chained using + or - - operators) are supported: - - - ``double`` - - ``signal`` - - ``log(signal)`` - - ``exp(signal)`` - - ``rr(signal, double > 0)`` -- reciprocal rank - transformation with second argument being a denominator - constant. - - ``is_nan(signal)`` -- returns 0 if signal is NaN, 1 - otherwise. - - ``fill_nan(signal1, signal2 | double)`` -- if signal1 is - NaN, returns signal2 \| double, else returns signal1. - - Here are a few examples of ranking formulas that use the - supported ranking expression types: - - - ``0.2 * semantic_similarity_score + 0.8 * log(keyword_similarity_score)`` - -- mostly rank by the logarithm of - ``keyword_similarity_score`` with slight - ``semantic_smilarity_score`` adjustment. - - ``0.2 * exp(fill_nan(semantic_similarity_score, 0)) + 0.3 * is_nan(keyword_similarity_score)`` - -- rank by the exponent of ``semantic_similarity_score`` - filling the value with 0 if it's NaN, also add constant - 0.3 adjustment to the final score if - ``semantic_similarity_score`` is NaN. - - ``0.2 * rr(semantic_similarity_score, 16) + 0.8 * rr(keyword_similarity_score, 16)`` - -- mostly rank by the reciprocal rank of - ``keyword_similarity_score`` with slight adjustment of - reciprocal rank of ``semantic_smilarity_score``. + - operators) are supported: + + - ``double`` + - ``signal`` + - ``log(signal)`` + - ``exp(signal)`` + - ``rr(signal, double > 0)`` -- reciprocal rank + transformation with second argument being a + denominator constant. + - ``is_nan(signal)`` -- returns 0 if signal is NaN, 1 + otherwise. + - ``fill_nan(signal1, signal2 | double)`` -- if signal1 + is NaN, returns signal2 \| double, else returns + signal1. + + Here are a few examples of ranking formulas that use the + supported ranking expression types: + + - ``0.2 * semantic_similarity_score + 0.8 * log(keyword_similarity_score)`` + -- mostly rank by the logarithm of + ``keyword_similarity_score`` with slight + ``semantic_smilarity_score`` adjustment. + - ``0.2 * exp(fill_nan(semantic_similarity_score, 0)) + 0.3 * is_nan(keyword_similarity_score)`` + -- rank by the exponent of + ``semantic_similarity_score`` filling the value with 0 + if it's NaN, also add constant 0.3 adjustment to the + final score if ``semantic_similarity_score`` is NaN. + - ``0.2 * rr(semantic_similarity_score, 16) + 0.8 * rr(keyword_similarity_score, 16)`` + -- mostly rank by the reciprocal rank of + ``keyword_similarity_score`` with slight adjustment of + reciprocal rank of ``semantic_smilarity_score``. The following signals are supported: - - ``semantic_similarity_score``: semantic similarity - adjustment that is calculated using the embeddings - generated by a proprietary Google model. This score - determines how semantically similar a search query is to a - document. - - ``keyword_similarity_score``: keyword match adjustment - uses the Best Match 25 (BM25) ranking function. This score - is calculated using a probabilistic model to estimate the - probability that a document is relevant to a given query. - - ``relevance_score``: semantic relevance adjustment that - uses a proprietary Google model to determine the meaning - and intent behind a user's query in context with the - content in the documents. - - ``pctr_rank``: predicted conversion rate adjustment as a - rank use predicted Click-through rate (pCTR) to gauge the - relevance and attractiveness of a search result from a - user's perspective. A higher pCTR suggests that the result - is more likely to satisfy the user's query and intent, - making it a valuable signal for ranking. - - ``freshness_rank``: freshness adjustment as a rank - - ``document_age``: The time in hours elapsed since the - document was last updated, a floating-point number (e.g., - 0.25 means 15 minutes). - - ``topicality_rank``: topicality adjustment as a rank. Uses - proprietary Google model to determine the keyword-based - overlap between the query and the document. - - ``base_rank``: the default rank of the result + - ``semantic_similarity_score``: semantic similarity + adjustment that is calculated using the embeddings + generated by a proprietary Google model. This score + determines how semantically similar a search query is to + a document. + - ``keyword_similarity_score``: keyword match adjustment + uses the Best Match 25 (BM25) ranking function. This + score is calculated using a probabilistic model to + estimate the probability that a document is relevant to a + given query. + - ``relevance_score``: semantic relevance adjustment that + uses a proprietary Google model to determine the meaning + and intent behind a user's query in context with the + content in the documents. + - ``pctr_rank``: predicted conversion rate adjustment as a + rank use predicted Click-through rate (pCTR) to gauge the + relevance and attractiveness of a search result from a + user's perspective. A higher pCTR suggests that the + result is more likely to satisfy the user's query and + intent, making it a valuable signal for ranking. + - ``freshness_rank``: freshness adjustment as a rank + - ``document_age``: The time in hours elapsed since the + document was last updated, a floating-point number (e.g., + 0.25 means 15 minutes). + - ``topicality_rank``: topicality adjustment as a rank. + Uses proprietary Google model to determine the + keyword-based overlap between the query and the document. + - ``base_rank``: the default rank of the result ranking_expression_backend (google.cloud.discoveryengine_v1.types.SearchRequest.RankingExpressionBackend): The backend to use for the ranking expression evaluation. @@ -427,6 +430,7 @@ class RelevanceThreshold(proto.Enum): HIGH (4): High relevance threshold. """ + RELEVANCE_THRESHOLD_UNSPECIFIED = 0 LOWEST = 1 LOW = 2 @@ -446,6 +450,7 @@ class RankingExpressionBackend(proto.Enum): RANK_BY_FORMULA (4): Ranking by custom formula. """ + RANKING_EXPRESSION_BACKEND_UNSPECIFIED = 0 RANK_BY_EMBEDDING = 3 RANK_BY_FORMULA = 4 @@ -581,11 +586,11 @@ class FacetSpec(proto.Message): Another example, assuming you have the following facets in the request: - - "rating", enable_dynamic_position = true + - "rating", enable_dynamic_position = true - - "price", enable_dynamic_position = false + - "price", enable_dynamic_position = false - - "brands", enable_dynamic_position = false + - "brands", enable_dynamic_position = false And also you have a dynamic facets enabled, which generates a facet ``gender``. Then the final order of the facets in @@ -644,13 +649,13 @@ class FacetKey(proto.Message): Allowed values are: - - "count desc", which means order by - [SearchResponse.Facet.values.count][google.cloud.discoveryengine.v1.SearchResponse.Facet.FacetValue.count] - descending. + - "count desc", which means order by + [SearchResponse.Facet.values.count][google.cloud.discoveryengine.v1.SearchResponse.Facet.FacetValue.count] + descending. - - "value desc", which means order by - [SearchResponse.Facet.values.value][google.cloud.discoveryengine.v1.SearchResponse.Facet.FacetValue.value] - descending. Only applies to textual facets. + - "value desc", which means order by + [SearchResponse.Facet.values.value][google.cloud.discoveryengine.v1.SearchResponse.Facet.FacetValue.value] + descending. Only applies to textual facets. If not set, textual values are sorted in `natural order `__; @@ -732,9 +737,9 @@ class ConditionBoostSpec(proto.Message): Examples: - - To boost documents with document ID "doc_1" or "doc_2", - and color "Red" or "Blue": - ``(document_id: ANY("doc_1", "doc_2")) AND (color: ANY("Red", "Blue"))`` + - To boost documents with document ID "doc_1" or "doc_2", + and color "Red" or "Blue": + ``(document_id: ANY("doc_1", "doc_2")) AND (color: ANY("Red", "Blue"))`` boost (float): Strength of the condition boost, which should be in [-1, 1]. Negative boost means demotion. Default is 0.0. @@ -809,6 +814,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -825,6 +831,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -934,6 +941,7 @@ class Condition(proto.Enum): Automatic query expansion built by the Search API. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 AUTO = 2 @@ -977,6 +985,7 @@ class Mode(proto.Enum): Search API. Search will be based on the corrected query if found. """ + MODE_UNSPECIFIED = 0 SUGGESTION_ONLY = 1 AUTO = 2 @@ -1026,6 +1035,7 @@ class SearchResultMode(proto.Enum): [DocumentProcessingConfig.chunking_config][google.cloud.discoveryengine.v1.DocumentProcessingConfig.chunking_config] is specified. """ + SEARCH_RESULT_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -1192,15 +1202,15 @@ class ModelSpec(proto.Message): Supported values are: - - ``stable``: string. Default value when no value is - specified. Uses a generally available, fine-tuned model. - For more information, see `Answer generation model - versions and - lifecycle `__. - - ``preview``: string. (Public preview) Uses a preview - model. For more information, see `Answer generation model - versions and - lifecycle `__. + - ``stable``: string. Default value when no value is + specified. Uses a generally available, fine-tuned model. + For more information, see `Answer generation model + versions and + lifecycle `__. + - ``preview``: string. (Public preview) Uses a preview + model. For more information, see `Answer generation model + versions and + lifecycle `__. """ version: str = proto.Field( @@ -1414,6 +1424,7 @@ class Condition(proto.Enum): ideal for single-API implementations (e.g., debouncing). """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1447,6 +1458,7 @@ class MatchHighlightingCondition(proto.Enum): MATCH_HIGHLIGHTING_ENABLED (2): Enables match highlighting on all documents. """ + MATCH_HIGHLIGHTING_CONDITION_UNSPECIFIED = 0 MATCH_HIGHLIGHTING_DISABLED = 1 MATCH_HIGHLIGHTING_ENABLED = 2 @@ -1951,12 +1963,12 @@ class FacetValue(proto.Message): proto.STRING, number=1, ) - values: MutableSequence[ - "SearchResponse.Facet.FacetValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.Facet.FacetValue", + values: MutableSequence["SearchResponse.Facet.FacetValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.Facet.FacetValue", + ) ) dynamic_facet: bool = proto.Field( proto.BOOL, @@ -2050,6 +2062,7 @@ class SummarySkippedReason(proto.Enum): Google skips the summary if the time out. """ + SUMMARY_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_SUMMARY_SEEKING_QUERY_IGNORED = 2 @@ -2094,12 +2107,12 @@ class CitationMetadata(proto.Message): Citations for segments. """ - citations: MutableSequence[ - "SearchResponse.Summary.Citation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SearchResponse.Summary.Citation", + citations: MutableSequence["SearchResponse.Summary.Citation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SearchResponse.Summary.Citation", + ) ) class Citation(proto.Message): @@ -2123,12 +2136,12 @@ class Citation(proto.Message): proto.INT64, number=2, ) - sources: MutableSequence[ - "SearchResponse.Summary.CitationSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.CitationSource", + sources: MutableSequence["SearchResponse.Summary.CitationSource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.CitationSource", + ) ) class CitationSource(proto.Message): @@ -2226,12 +2239,12 @@ class SummaryWithMetadata(proto.Message): number=2, message="SearchResponse.Summary.CitationMetadata", ) - references: MutableSequence[ - "SearchResponse.Summary.Reference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.Reference", + references: MutableSequence["SearchResponse.Summary.Reference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.Reference", + ) ) summary_text: str = proto.Field( @@ -2360,12 +2373,12 @@ def raw_page(self): number=19, message=SessionInfo, ) - search_link_promotions: MutableSequence[ - common.SearchLinkPromotion - ] = proto.RepeatedField( - proto.MESSAGE, - number=23, - message=common.SearchLinkPromotion, + search_link_promotions: MutableSequence[common.SearchLinkPromotion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=23, + message=common.SearchLinkPromotion, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py index c054af1613aa..76af8957656e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/search_tuning_service.py @@ -17,11 +17,13 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + +from google.cloud.discoveryengine_v1.types import custom_tuning_model +from google.cloud.discoveryengine_v1.types import import_config from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import custom_tuning_model, import_config __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -65,12 +67,12 @@ class ListCustomModelsResponse(proto.Message): List of custom tuning models. """ - models: MutableSequence[ - custom_tuning_model.CustomTuningModel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_tuning_model.CustomTuningModel, + models: MutableSequence[custom_tuning_model.CustomTuningModel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_tuning_model.CustomTuningModel, + ) ) @@ -95,8 +97,8 @@ class TrainCustomModelRequest(proto.Message): model_type (str): Model to be trained. Supported values are: - - **search-tuning**: Fine tuning the search system based on - data provided. + - **search-tuning**: Fine tuning the search system based on + data provided. error_config (google.cloud.discoveryengine_v1.types.ImportErrorConfig): The desired location of errors incurred during the data ingestion and training. @@ -136,8 +138,8 @@ class GcsTrainingInput(proto.Message): number in ``[0, inf+)``. The larger the number is, the more relevant the pair is. Example: - - ``query-id\tcorpus-id\tscore`` - - ``query1\tdoc1\t1`` + - ``query-id\tcorpus-id\tscore`` + - ``query1\tdoc1\t1`` test_data_path (str): Cloud Storage test data. Same format as train_data_path. If not provided, a random 80/20 train/test split will be @@ -202,15 +204,15 @@ class TrainCustomModelResponse(proto.Message): model_status (str): The trained model status. Possible values are: - - **bad-data**: The training data quality is bad. - - **no-improvement**: Tuning didn't improve performance. - Won't deploy. - - **in-progress**: Model training job creation is in - progress. - - **training**: Model is actively training. - - **evaluating**: The model is evaluating trained metrics. - - **indexing**: The model trained metrics are indexing. - - **ready**: The model is ready for serving. + - **bad-data**: The training data quality is bad. + - **no-improvement**: Tuning didn't improve performance. + Won't deploy. + - **in-progress**: Model training job creation is in + progress. + - **training**: Model is actively training. + - **evaluating**: The model is evaluating trained metrics. + - **indexing**: The model trained metrics are indexing. + - **ready**: The model is ready for serving. metrics (MutableMapping[str, float]): The metrics of the trained model. model_name (str): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config.py index a8e4f0566f16..c0584205387f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config.py @@ -17,10 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1.types import common, search_service +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import search_service +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -82,11 +84,11 @@ class ServingConfig(proto.Message): e.g. ``medium-diversity`` or ``high-diversity``. Currently supported values: - - ``no-diversity`` - - ``low-diversity`` - - ``medium-diversity`` - - ``high-diversity`` - - ``auto-diversity`` + - ``no-diversity`` + - ``low-diversity`` + - ``medium-diversity`` + - ``high-diversity`` + - ``auto-diversity`` If not specified, we choose default based on recommendation model type. Default value: ``no-diversity``. @@ -107,21 +109,21 @@ class ServingConfig(proto.Message): The ranking expression is a single function or multiple functions that are joined by "+". - - ranking_expression = function, { " + ", function }; + - ranking_expression = function, { " + ", function }; Supported functions: - - double \* relevance_score - - double \* dotProduct(embedding_field_path) + - double \* relevance_score + - double \* dotProduct(embedding_field_path) Function variables: - - ``relevance_score``: pre-defined keywords, used for - measure relevance between query and document. - - ``embedding_field_path``: the document embedding field - used with query embedding vector. - - ``dotProduct``: embedding function between - embedding_field_path and query embedding vector. + - ``relevance_score``: pre-defined keywords, used for + measure relevance between query and document. + - ``embedding_field_path``: the document embedding field + used with query embedding vector. + - ``dotProduct``: embedding function between + embedding_field_path and query embedding vector. Example ranking expression: @@ -208,19 +210,19 @@ class MediaConfig(proto.Message): r"""Specifies the configurations needed for Media Discovery. Currently we support: - - ``demote_content_watched``: Threshold for watched content - demotion. Customers can specify if using watched content demotion - or use viewed detail page. Using the content watched demotion, - customers need to specify the watched minutes or percentage - exceeds the threshold, the content will be demoted in the - recommendation result. - - ``promote_fresh_content``: cutoff days for fresh content - promotion. Customers can specify if using content freshness - promotion. If the content was published within the cutoff days, - the content will be promoted in the recommendation result. Can - only be set if - [SolutionType][google.cloud.discoveryengine.v1.SolutionType] is - [SOLUTION_TYPE_RECOMMENDATION][google.cloud.discoveryengine.v1.SolutionType.SOLUTION_TYPE_RECOMMENDATION]. + - ``demote_content_watched``: Threshold for watched content + demotion. Customers can specify if using watched content demotion + or use viewed detail page. Using the content watched demotion, + customers need to specify the watched minutes or percentage + exceeds the threshold, the content will be demoted in the + recommendation result. + - ``promote_fresh_content``: cutoff days for fresh content + promotion. Customers can specify if using content freshness + promotion. If the content was published within the cutoff days, + the content will be promoted in the recommendation result. Can + only be set if + [SolutionType][google.cloud.discoveryengine.v1.SolutionType] is + [SOLUTION_TYPE_RECOMMENDATION][google.cloud.discoveryengine.v1.SolutionType.SOLUTION_TYPE_RECOMMENDATION]. This message has `oneof`_ fields (mutually exclusive fields). For each oneof, at most one member field can be set at the same time. @@ -245,11 +247,11 @@ class MediaConfig(proto.Message): Specifies the event type used for demoting recommendation result. Currently supported values: - - ``view-item``: Item viewed. - - ``media-play``: Start/resume watching a video, playing a - song, etc. - - ``media-complete``: Finished or stopped midway through a - video, song, etc. + - ``view-item``: Item viewed. + - ``media-play``: Start/resume watching a video, playing a + song, etc. + - ``media-complete``: Finished or stopped midway through a + video, song, etc. If unset, watch history demotion will not be applied. Content freshness demotion will still be applied. @@ -292,7 +294,8 @@ class GenericConfig(proto.Message): r"""Specifies the configurations needed for Generic Discovery.Currently we support: - - ``content_search_spec``: configuration for generic content search. + - ``content_search_spec``: configuration for generic content + search. Attributes: content_search_spec (google.cloud.discoveryengine_v1.types.SearchRequest.ContentSearchSpec): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config_service.py index a98b56d80234..4c1dbc92715e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/serving_config_service.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -41,7 +42,7 @@ class UpdateServingConfigRequest(proto.Message): [ServingConfig][google.cloud.discoveryengine.v1.ServingConfig] to update. The following are NOT supported: - - [ServingConfig.name][google.cloud.discoveryengine.v1.ServingConfig.name] + - [ServingConfig.name][google.cloud.discoveryengine.v1.ServingConfig.name] If not set, all supported fields are updated. """ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py index ce86a30fea33..76c2602bb12c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import answer as gcd_answer from google.cloud.discoveryengine_v1.types import assist_answer +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -73,6 +74,7 @@ class State(proto.Enum): IN_PROGRESS (1): The session is currently open. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session_service.py index ce1317454da2..a0f4370a181d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/session_service.py @@ -15,6 +15,7 @@ # import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={}, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py index d9e98efc17a5..3ffba755301c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -103,6 +105,7 @@ class Type(proto.Enum): EXCLUDE (2): Exclude the target site. """ + TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -135,6 +138,7 @@ class IndexingStatus(proto.Enum): CANCELLED (6): The target site change is cancelled. """ + INDEXING_STATUS_UNSPECIFIED = 0 PENDING = 1 FAILED = 2 @@ -251,6 +255,7 @@ class SiteVerificationState(proto.Enum): Site exempt from verification, e.g., a public website that opens to all. """ + SITE_VERIFICATION_STATE_UNSPECIFIED = 0 VERIFIED = 1 UNVERIFIED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py index b4a266e68246..7727507148fb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/site_search_engine_service.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import ( site_search_engine as gcd_site_search_engine, ) +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -371,12 +372,12 @@ class ListTargetSitesResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -424,12 +425,12 @@ class BatchCreateTargetSitesResponse(proto.Message): TargetSites created. """ - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) @@ -829,6 +830,7 @@ class CorpusType(proto.Enum): Denotes a crawling attempt for the mobile version of a page. """ + CORPUS_TYPE_UNSPECIFIED = 0 DESKTOP = 1 MOBILE = 2 @@ -1084,12 +1086,12 @@ class FetchDomainVerificationStatusResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event.py index 4bed1bf502f0..7c1319298e98 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1.types import common +from google.protobuf import duration_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -49,31 +50,31 @@ class UserEvent(proto.Message): Generic values: - - ``search``: Search for Documents. - - ``view-item``: Detailed page view of a Document. - - ``view-item-list``: View of a panel or ordered list of - Documents. - - ``view-home-page``: View of the home page. - - ``view-category-page``: View of a category page, e.g. Home - > Men > Jeans - - ``add-feedback``: Add a user feedback. + - ``search``: Search for Documents. + - ``view-item``: Detailed page view of a Document. + - ``view-item-list``: View of a panel or ordered list of + Documents. + - ``view-home-page``: View of the home page. + - ``view-category-page``: View of a category page, e.g. + Home > Men > Jeans + - ``add-feedback``: Add a user feedback. Retail-related values: - - ``add-to-cart``: Add an item(s) to cart, e.g. in Retail - online shopping - - ``purchase``: Purchase an item(s) + - ``add-to-cart``: Add an item(s) to cart, e.g. in Retail + online shopping + - ``purchase``: Purchase an item(s) Media-related values: - - ``media-play``: Start/resume watching a video, playing a - song, etc. - - ``media-complete``: Finished or stopped midway through a - video, song, etc. + - ``media-play``: Start/resume watching a video, playing a + song, etc. + - ``media-complete``: Finished or stopped midway through a + video, song, etc. Custom conversion value: - - ``conversion``: Customer defined conversion event. + - ``conversion``: Customer defined conversion event. conversion_type (str): Optional. Conversion type. @@ -175,12 +176,12 @@ class UserEvent(proto.Message): The value must be one of: - - [RecommendResponse.attribution_token][google.cloud.discoveryengine.v1.RecommendResponse.attribution_token] - for events that are the result of - [RecommendationService.Recommend][google.cloud.discoveryengine.v1.RecommendationService.Recommend]. - - [SearchResponse.attribution_token][google.cloud.discoveryengine.v1.SearchResponse.attribution_token] - for events that are the result of - [SearchService.Search][google.cloud.discoveryengine.v1.SearchService.Search]. + - [RecommendResponse.attribution_token][google.cloud.discoveryengine.v1.RecommendResponse.attribution_token] + for events that are the result of + [RecommendationService.Recommend][google.cloud.discoveryengine.v1.RecommendationService.Recommend]. + - [SearchResponse.attribution_token][google.cloud.discoveryengine.v1.SearchResponse.attribution_token] + for events that are the result of + [SearchService.Search][google.cloud.discoveryengine.v1.SearchService.Search]. This token enables us to accurately attribute page view or conversion completion back to the event and the particular @@ -220,11 +221,11 @@ class UserEvent(proto.Message): This field is optional except for the following event types: - - ``view-item`` - - ``add-to-cart`` - - ``purchase`` - - ``media-play`` - - ``media-complete`` + - ``view-item`` + - ``add-to-cart`` + - ``purchase`` + - ``media-play`` + - ``media-complete`` In a ``search`` event, this field represents the documents returned to the end user on the current page (the end user @@ -278,12 +279,12 @@ class UserEvent(proto.Message): This field needs to pass all below criteria, otherwise an ``INVALID_ARGUMENT`` error is returned: - - The key must be a UTF-8 encoded string with a length limit - of 5,000 characters. - - For text attributes, at most 400 values are allowed. Empty - values are not allowed. Each value must be a UTF-8 encoded - string with a length limit of 256 characters. - - For number attributes, at most 400 values are allowed. + - The key must be a UTF-8 encoded string with a length + limit of 5,000 characters. + - For text attributes, at most 400 values are allowed. + Empty values are not allowed. Each value must be a UTF-8 + encoded string with a length limit of 256 characters. + - For number attributes, at most 400 values are allowed. For product recommendations, an example of extra user information is ``traffic_channel``, which is how a user @@ -591,12 +592,12 @@ class TransactionInfo(proto.Message): manufacturing costs, shipping expenses not borne by the end user, or any other costs, such that: - - Profit = - [value][google.cloud.discoveryengine.v1.TransactionInfo.value] - - - [tax][google.cloud.discoveryengine.v1.TransactionInfo.tax] - - - [cost][google.cloud.discoveryengine.v1.TransactionInfo.cost] + - Profit = + [value][google.cloud.discoveryengine.v1.TransactionInfo.value] + - + [tax][google.cloud.discoveryengine.v1.TransactionInfo.tax] + - + [cost][google.cloud.discoveryengine.v1.TransactionInfo.cost] This field is a member of `oneof`_ ``_cost``. discount_value (float): @@ -618,12 +619,12 @@ class TransactionInfo(proto.Message): can be larger than [TransactionInfo.value][google.cloud.discoveryengine.v1.TransactionInfo.value]: - - Profit = - [value][google.cloud.discoveryengine.v1.TransactionInfo.value] - - - [tax][google.cloud.discoveryengine.v1.TransactionInfo.tax] - - - [cost][google.cloud.discoveryengine.v1.TransactionInfo.cost] + - Profit = + [value][google.cloud.discoveryengine.v1.TransactionInfo.value] + - + [tax][google.cloud.discoveryengine.v1.TransactionInfo.tax] + - + [cost][google.cloud.discoveryengine.v1.TransactionInfo.cost] This field is a member of `oneof`_ ``_discount_value``. """ @@ -694,8 +695,8 @@ class DocumentInfo(proto.Message): Required for events of the following event types: - - ``add-to-cart`` - - ``purchase`` + - ``add-to-cart`` + - ``purchase`` This field is a member of `oneof`_ ``_quantity``. promotion_ids (MutableSequence[str]): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event_service.py index c547864b34f8..92ba1147590c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_event_service.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1.types import user_event as gcd_user_event + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py index 203b5ed77612..6f5170b8f685 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", manifest={ @@ -84,6 +86,7 @@ class LicenseAssignmentState(proto.Enum): cannot get license assigned will be assigned NO_LICENSE state(License could be unassigned by admin). """ + LICENSE_ASSIGNMENT_STATE_UNSPECIFIED = 0 ASSIGNED = 1 UNASSIGNED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license_service.py index 44d117f50b75..d133b3036b7e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1/types/user_license_service.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + +from google.cloud.discoveryengine_v1.types import user_license from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1.types import user_license __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1", @@ -64,19 +65,20 @@ class ListUserLicensesRequest(proto.Message): Supported fields: - - ``license_assignment_state`` + - ``license_assignment_state`` Examples: - - ``license_assignment_state = ASSIGNED`` to list assigned - user licenses. - - ``license_assignment_state = NO_LICENSE`` to list not - licensed users. - - ``license_assignment_state = NO_LICENSE_ATTEMPTED_LOGIN`` - to list users who attempted login but no license assigned. - - ``license_assignment_state != NO_LICENSE_ATTEMPTED_LOGIN`` - to filter out users who attempted login but no license - assigned. + - ``license_assignment_state = ASSIGNED`` to list assigned + user licenses. + - ``license_assignment_state = NO_LICENSE`` to list not + licensed users. + - ``license_assignment_state = NO_LICENSE_ATTEMPTED_LOGIN`` + to list users who attempted login but no license + assigned. + - ``license_assignment_state != NO_LICENSE_ATTEMPTED_LOGIN`` + to filter out users who attempted login but no license + assigned. """ parent: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py index 1b31e3f011e5..7a5aff878c45 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/__init__.py @@ -18,347 +18,309 @@ __version__ = package_version.__version__ -from .services.acl_config_service import ( - AclConfigServiceAsyncClient, - AclConfigServiceClient, -) -from .services.chunk_service import ChunkServiceAsyncClient, ChunkServiceClient -from .services.completion_service import ( - CompletionServiceAsyncClient, - CompletionServiceClient, -) -from .services.control_service import ControlServiceAsyncClient, ControlServiceClient +from .services.acl_config_service import AclConfigServiceClient +from .services.acl_config_service import AclConfigServiceAsyncClient +from .services.chunk_service import ChunkServiceClient +from .services.chunk_service import ChunkServiceAsyncClient +from .services.completion_service import CompletionServiceClient +from .services.completion_service import CompletionServiceAsyncClient +from .services.control_service import ControlServiceClient +from .services.control_service import ControlServiceAsyncClient +from .services.conversational_search_service import ConversationalSearchServiceClient from .services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, - ConversationalSearchServiceClient, -) -from .services.data_store_service import ( - DataStoreServiceAsyncClient, - DataStoreServiceClient, -) -from .services.document_service import DocumentServiceAsyncClient, DocumentServiceClient -from .services.engine_service import EngineServiceAsyncClient, EngineServiceClient -from .services.estimate_billing_service import ( - EstimateBillingServiceAsyncClient, - EstimateBillingServiceClient, -) -from .services.evaluation_service import ( - EvaluationServiceAsyncClient, - EvaluationServiceClient, -) -from .services.grounded_generation_service import ( - GroundedGenerationServiceAsyncClient, - GroundedGenerationServiceClient, -) -from .services.project_service import ProjectServiceAsyncClient, ProjectServiceClient -from .services.rank_service import RankServiceAsyncClient, RankServiceClient -from .services.recommendation_service import ( - RecommendationServiceAsyncClient, - RecommendationServiceClient, -) -from .services.sample_query_service import ( - SampleQueryServiceAsyncClient, - SampleQueryServiceClient, -) -from .services.sample_query_set_service import ( - SampleQuerySetServiceAsyncClient, - SampleQuerySetServiceClient, -) -from .services.schema_service import SchemaServiceAsyncClient, SchemaServiceClient -from .services.search_service import SearchServiceAsyncClient, SearchServiceClient -from .services.search_tuning_service import ( - SearchTuningServiceAsyncClient, - SearchTuningServiceClient, -) -from .services.serving_config_service import ( - ServingConfigServiceAsyncClient, - ServingConfigServiceClient, -) -from .services.session_service import SessionServiceAsyncClient, SessionServiceClient -from .services.site_search_engine_service import ( - SiteSearchEngineServiceAsyncClient, - SiteSearchEngineServiceClient, -) -from .services.user_event_service import ( - UserEventServiceAsyncClient, - UserEventServiceClient, ) +from .services.data_store_service import DataStoreServiceClient +from .services.data_store_service import DataStoreServiceAsyncClient +from .services.document_service import DocumentServiceClient +from .services.document_service import DocumentServiceAsyncClient +from .services.engine_service import EngineServiceClient +from .services.engine_service import EngineServiceAsyncClient +from .services.estimate_billing_service import EstimateBillingServiceClient +from .services.estimate_billing_service import EstimateBillingServiceAsyncClient +from .services.evaluation_service import EvaluationServiceClient +from .services.evaluation_service import EvaluationServiceAsyncClient +from .services.grounded_generation_service import GroundedGenerationServiceClient +from .services.grounded_generation_service import GroundedGenerationServiceAsyncClient +from .services.project_service import ProjectServiceClient +from .services.project_service import ProjectServiceAsyncClient +from .services.rank_service import RankServiceClient +from .services.rank_service import RankServiceAsyncClient +from .services.recommendation_service import RecommendationServiceClient +from .services.recommendation_service import RecommendationServiceAsyncClient +from .services.sample_query_service import SampleQueryServiceClient +from .services.sample_query_service import SampleQueryServiceAsyncClient +from .services.sample_query_set_service import SampleQuerySetServiceClient +from .services.sample_query_set_service import SampleQuerySetServiceAsyncClient +from .services.schema_service import SchemaServiceClient +from .services.schema_service import SchemaServiceAsyncClient +from .services.search_service import SearchServiceClient +from .services.search_service import SearchServiceAsyncClient +from .services.search_tuning_service import SearchTuningServiceClient +from .services.search_tuning_service import SearchTuningServiceAsyncClient +from .services.serving_config_service import ServingConfigServiceClient +from .services.serving_config_service import ServingConfigServiceAsyncClient +from .services.session_service import SessionServiceClient +from .services.session_service import SessionServiceAsyncClient +from .services.site_search_engine_service import SiteSearchEngineServiceClient +from .services.site_search_engine_service import SiteSearchEngineServiceAsyncClient +from .services.user_event_service import UserEventServiceClient +from .services.user_event_service import UserEventServiceAsyncClient + from .types.acl_config import AclConfig -from .types.acl_config_service import GetAclConfigRequest, UpdateAclConfigRequest +from .types.acl_config_service import GetAclConfigRequest +from .types.acl_config_service import UpdateAclConfigRequest from .types.answer import Answer from .types.chunk import Chunk -from .types.chunk_service import GetChunkRequest, ListChunksRequest, ListChunksResponse -from .types.common import ( - CustomAttribute, - CustomFineTuningSpec, - DoubleList, - EmbeddingConfig, - FileOriginType, - GuidedSearchSpec, - IdpConfig, - IndustryVertical, - Interval, - Principal, - SearchAddOn, - SearchTier, - SearchUseCase, - SolutionType, - UserInfo, -) -from .types.completion import CompletionSuggestion, SuggestionDenyListEntry -from .types.completion_service import CompleteQueryRequest, CompleteQueryResponse -from .types.control import Condition, Control -from .types.control_service import ( - CreateControlRequest, - DeleteControlRequest, - GetControlRequest, - ListControlsRequest, - ListControlsResponse, - UpdateControlRequest, -) -from .types.conversation import ( - Conversation, - ConversationContext, - ConversationMessage, - Reply, - TextInput, -) -from .types.conversational_search_service import ( - AnswerQueryRequest, - AnswerQueryResponse, - ConverseConversationRequest, - ConverseConversationResponse, - CreateConversationRequest, - CreateSessionRequest, - DeleteConversationRequest, - DeleteSessionRequest, - GetAnswerRequest, - GetConversationRequest, - GetSessionRequest, - ListConversationsRequest, - ListConversationsResponse, - ListSessionsRequest, - ListSessionsResponse, - UpdateConversationRequest, - UpdateSessionRequest, -) +from .types.chunk_service import GetChunkRequest +from .types.chunk_service import ListChunksRequest +from .types.chunk_service import ListChunksResponse +from .types.common import CustomAttribute +from .types.common import CustomFineTuningSpec +from .types.common import DoubleList +from .types.common import EmbeddingConfig +from .types.common import GuidedSearchSpec +from .types.common import IdpConfig +from .types.common import Interval +from .types.common import Principal +from .types.common import UserInfo +from .types.common import FileOriginType +from .types.common import IndustryVertical +from .types.common import SearchAddOn +from .types.common import SearchTier +from .types.common import SearchUseCase +from .types.common import SolutionType +from .types.completion import CompletionSuggestion +from .types.completion import SuggestionDenyListEntry +from .types.completion_service import CompleteQueryRequest +from .types.completion_service import CompleteQueryResponse +from .types.control import Condition +from .types.control import Control +from .types.control_service import CreateControlRequest +from .types.control_service import DeleteControlRequest +from .types.control_service import GetControlRequest +from .types.control_service import ListControlsRequest +from .types.control_service import ListControlsResponse +from .types.control_service import UpdateControlRequest +from .types.conversation import Conversation +from .types.conversation import ConversationContext +from .types.conversation import ConversationMessage +from .types.conversation import Reply +from .types.conversation import TextInput +from .types.conversational_search_service import AnswerQueryRequest +from .types.conversational_search_service import AnswerQueryResponse +from .types.conversational_search_service import ConverseConversationRequest +from .types.conversational_search_service import ConverseConversationResponse +from .types.conversational_search_service import CreateConversationRequest +from .types.conversational_search_service import CreateSessionRequest +from .types.conversational_search_service import DeleteConversationRequest +from .types.conversational_search_service import DeleteSessionRequest +from .types.conversational_search_service import GetAnswerRequest +from .types.conversational_search_service import GetConversationRequest +from .types.conversational_search_service import GetSessionRequest +from .types.conversational_search_service import ListConversationsRequest +from .types.conversational_search_service import ListConversationsResponse +from .types.conversational_search_service import ListSessionsRequest +from .types.conversational_search_service import ListSessionsResponse +from .types.conversational_search_service import UpdateConversationRequest +from .types.conversational_search_service import UpdateSessionRequest from .types.custom_tuning_model import CustomTuningModel -from .types.data_store import DataStore, LanguageInfo, WorkspaceConfig -from .types.data_store_service import ( - CreateDataStoreMetadata, - CreateDataStoreRequest, - DeleteDataStoreMetadata, - DeleteDataStoreRequest, - GetDataStoreRequest, - GetDocumentProcessingConfigRequest, - ListDataStoresRequest, - ListDataStoresResponse, - UpdateDataStoreRequest, - UpdateDocumentProcessingConfigRequest, -) -from .types.document import Document, ProcessedDocument +from .types.data_store import DataStore +from .types.data_store import LanguageInfo +from .types.data_store import WorkspaceConfig +from .types.data_store_service import CreateDataStoreMetadata +from .types.data_store_service import CreateDataStoreRequest +from .types.data_store_service import DeleteDataStoreMetadata +from .types.data_store_service import DeleteDataStoreRequest +from .types.data_store_service import GetDataStoreRequest +from .types.data_store_service import GetDocumentProcessingConfigRequest +from .types.data_store_service import ListDataStoresRequest +from .types.data_store_service import ListDataStoresResponse +from .types.data_store_service import UpdateDataStoreRequest +from .types.data_store_service import UpdateDocumentProcessingConfigRequest +from .types.document import Document +from .types.document import ProcessedDocument from .types.document_processing_config import DocumentProcessingConfig -from .types.document_service import ( - BatchGetDocumentsMetadataRequest, - BatchGetDocumentsMetadataResponse, - CreateDocumentRequest, - DeleteDocumentRequest, - GetDocumentRequest, - GetProcessedDocumentRequest, - ListDocumentsRequest, - ListDocumentsResponse, - UpdateDocumentRequest, -) +from .types.document_service import BatchGetDocumentsMetadataRequest +from .types.document_service import BatchGetDocumentsMetadataResponse +from .types.document_service import CreateDocumentRequest +from .types.document_service import DeleteDocumentRequest +from .types.document_service import GetDocumentRequest +from .types.document_service import GetProcessedDocumentRequest +from .types.document_service import ListDocumentsRequest +from .types.document_service import ListDocumentsResponse +from .types.document_service import UpdateDocumentRequest from .types.engine import Engine -from .types.engine_service import ( - CreateEngineMetadata, - CreateEngineRequest, - DeleteEngineMetadata, - DeleteEngineRequest, - GetEngineRequest, - ListEnginesRequest, - ListEnginesResponse, - PauseEngineRequest, - ResumeEngineRequest, - TuneEngineMetadata, - TuneEngineRequest, - TuneEngineResponse, - UpdateEngineRequest, -) -from .types.estimate_billing_service import ( - EstimateDataSizeMetadata, - EstimateDataSizeRequest, - EstimateDataSizeResponse, -) -from .types.evaluation import Evaluation, QualityMetrics -from .types.evaluation_service import ( - CreateEvaluationMetadata, - CreateEvaluationRequest, - GetEvaluationRequest, - ListEvaluationResultsRequest, - ListEvaluationResultsResponse, - ListEvaluationsRequest, - ListEvaluationsResponse, -) -from .types.grounded_generation_service import ( - CheckGroundingRequest, - CheckGroundingResponse, - CheckGroundingSpec, -) -from .types.grounding import FactChunk, GroundingFact -from .types.import_config import ( - AlloyDbSource, - BigQuerySource, - BigtableOptions, - BigtableSource, - CloudSqlSource, - FhirStoreSource, - FirestoreSource, - GcsSource, - ImportCompletionSuggestionsMetadata, - ImportCompletionSuggestionsRequest, - ImportCompletionSuggestionsResponse, - ImportDocumentsMetadata, - ImportDocumentsRequest, - ImportDocumentsResponse, - ImportErrorConfig, - ImportSampleQueriesMetadata, - ImportSampleQueriesRequest, - ImportSampleQueriesResponse, - ImportSuggestionDenyListEntriesMetadata, - ImportSuggestionDenyListEntriesRequest, - ImportSuggestionDenyListEntriesResponse, - ImportUserEventsMetadata, - ImportUserEventsRequest, - ImportUserEventsResponse, - SpannerSource, -) +from .types.engine_service import CreateEngineMetadata +from .types.engine_service import CreateEngineRequest +from .types.engine_service import DeleteEngineMetadata +from .types.engine_service import DeleteEngineRequest +from .types.engine_service import GetEngineRequest +from .types.engine_service import ListEnginesRequest +from .types.engine_service import ListEnginesResponse +from .types.engine_service import PauseEngineRequest +from .types.engine_service import ResumeEngineRequest +from .types.engine_service import TuneEngineMetadata +from .types.engine_service import TuneEngineRequest +from .types.engine_service import TuneEngineResponse +from .types.engine_service import UpdateEngineRequest +from .types.estimate_billing_service import EstimateDataSizeMetadata +from .types.estimate_billing_service import EstimateDataSizeRequest +from .types.estimate_billing_service import EstimateDataSizeResponse +from .types.evaluation import Evaluation +from .types.evaluation import QualityMetrics +from .types.evaluation_service import CreateEvaluationMetadata +from .types.evaluation_service import CreateEvaluationRequest +from .types.evaluation_service import GetEvaluationRequest +from .types.evaluation_service import ListEvaluationResultsRequest +from .types.evaluation_service import ListEvaluationResultsResponse +from .types.evaluation_service import ListEvaluationsRequest +from .types.evaluation_service import ListEvaluationsResponse +from .types.grounded_generation_service import CheckGroundingRequest +from .types.grounded_generation_service import CheckGroundingResponse +from .types.grounded_generation_service import CheckGroundingSpec +from .types.grounding import FactChunk +from .types.grounding import GroundingFact +from .types.import_config import AlloyDbSource +from .types.import_config import BigQuerySource +from .types.import_config import BigtableOptions +from .types.import_config import BigtableSource +from .types.import_config import CloudSqlSource +from .types.import_config import FhirStoreSource +from .types.import_config import FirestoreSource +from .types.import_config import GcsSource +from .types.import_config import ImportCompletionSuggestionsMetadata +from .types.import_config import ImportCompletionSuggestionsRequest +from .types.import_config import ImportCompletionSuggestionsResponse +from .types.import_config import ImportDocumentsMetadata +from .types.import_config import ImportDocumentsRequest +from .types.import_config import ImportDocumentsResponse +from .types.import_config import ImportErrorConfig +from .types.import_config import ImportSampleQueriesMetadata +from .types.import_config import ImportSampleQueriesRequest +from .types.import_config import ImportSampleQueriesResponse +from .types.import_config import ImportSuggestionDenyListEntriesMetadata +from .types.import_config import ImportSuggestionDenyListEntriesRequest +from .types.import_config import ImportSuggestionDenyListEntriesResponse +from .types.import_config import ImportUserEventsMetadata +from .types.import_config import ImportUserEventsRequest +from .types.import_config import ImportUserEventsResponse +from .types.import_config import SpannerSource from .types.project import Project -from .types.project_service import ( - GetProjectRequest, - ProvisionProjectMetadata, - ProvisionProjectRequest, - ReportConsentChangeRequest, -) -from .types.purge_config import ( - PurgeCompletionSuggestionsMetadata, - PurgeCompletionSuggestionsRequest, - PurgeCompletionSuggestionsResponse, - PurgeDocumentsMetadata, - PurgeDocumentsRequest, - PurgeDocumentsResponse, - PurgeErrorConfig, - PurgeSuggestionDenyListEntriesMetadata, - PurgeSuggestionDenyListEntriesRequest, - PurgeSuggestionDenyListEntriesResponse, - PurgeUserEventsMetadata, - PurgeUserEventsRequest, - PurgeUserEventsResponse, -) -from .types.rank_service import RankingRecord, RankRequest, RankResponse -from .types.recommendation_service import RecommendRequest, RecommendResponse +from .types.project_service import GetProjectRequest +from .types.project_service import ProvisionProjectMetadata +from .types.project_service import ProvisionProjectRequest +from .types.project_service import ReportConsentChangeRequest +from .types.purge_config import PurgeCompletionSuggestionsMetadata +from .types.purge_config import PurgeCompletionSuggestionsRequest +from .types.purge_config import PurgeCompletionSuggestionsResponse +from .types.purge_config import PurgeDocumentsMetadata +from .types.purge_config import PurgeDocumentsRequest +from .types.purge_config import PurgeDocumentsResponse +from .types.purge_config import PurgeErrorConfig +from .types.purge_config import PurgeSuggestionDenyListEntriesMetadata +from .types.purge_config import PurgeSuggestionDenyListEntriesRequest +from .types.purge_config import PurgeSuggestionDenyListEntriesResponse +from .types.purge_config import PurgeUserEventsMetadata +from .types.purge_config import PurgeUserEventsRequest +from .types.purge_config import PurgeUserEventsResponse +from .types.rank_service import RankingRecord +from .types.rank_service import RankRequest +from .types.rank_service import RankResponse +from .types.recommendation_service import RecommendRequest +from .types.recommendation_service import RecommendResponse from .types.sample_query import SampleQuery -from .types.sample_query_service import ( - CreateSampleQueryRequest, - DeleteSampleQueryRequest, - GetSampleQueryRequest, - ListSampleQueriesRequest, - ListSampleQueriesResponse, - UpdateSampleQueryRequest, -) +from .types.sample_query_service import CreateSampleQueryRequest +from .types.sample_query_service import DeleteSampleQueryRequest +from .types.sample_query_service import GetSampleQueryRequest +from .types.sample_query_service import ListSampleQueriesRequest +from .types.sample_query_service import ListSampleQueriesResponse +from .types.sample_query_service import UpdateSampleQueryRequest from .types.sample_query_set import SampleQuerySet -from .types.sample_query_set_service import ( - CreateSampleQuerySetRequest, - DeleteSampleQuerySetRequest, - GetSampleQuerySetRequest, - ListSampleQuerySetsRequest, - ListSampleQuerySetsResponse, - UpdateSampleQuerySetRequest, -) -from .types.schema import FieldConfig, Schema -from .types.schema_service import ( - CreateSchemaMetadata, - CreateSchemaRequest, - DeleteSchemaMetadata, - DeleteSchemaRequest, - GetSchemaRequest, - ListSchemasRequest, - ListSchemasResponse, - UpdateSchemaMetadata, - UpdateSchemaRequest, -) -from .types.search_service import SearchRequest, SearchResponse -from .types.search_tuning_service import ( - ListCustomModelsRequest, - ListCustomModelsResponse, - TrainCustomModelMetadata, - TrainCustomModelRequest, - TrainCustomModelResponse, -) +from .types.sample_query_set_service import CreateSampleQuerySetRequest +from .types.sample_query_set_service import DeleteSampleQuerySetRequest +from .types.sample_query_set_service import GetSampleQuerySetRequest +from .types.sample_query_set_service import ListSampleQuerySetsRequest +from .types.sample_query_set_service import ListSampleQuerySetsResponse +from .types.sample_query_set_service import UpdateSampleQuerySetRequest +from .types.schema import FieldConfig +from .types.schema import Schema +from .types.schema_service import CreateSchemaMetadata +from .types.schema_service import CreateSchemaRequest +from .types.schema_service import DeleteSchemaMetadata +from .types.schema_service import DeleteSchemaRequest +from .types.schema_service import GetSchemaRequest +from .types.schema_service import ListSchemasRequest +from .types.schema_service import ListSchemasResponse +from .types.schema_service import UpdateSchemaMetadata +from .types.schema_service import UpdateSchemaRequest +from .types.search_service import SearchRequest +from .types.search_service import SearchResponse +from .types.search_tuning_service import ListCustomModelsRequest +from .types.search_tuning_service import ListCustomModelsResponse +from .types.search_tuning_service import TrainCustomModelMetadata +from .types.search_tuning_service import TrainCustomModelRequest +from .types.search_tuning_service import TrainCustomModelResponse from .types.serving_config import ServingConfig -from .types.serving_config_service import ( - GetServingConfigRequest, - ListServingConfigsRequest, - ListServingConfigsResponse, - UpdateServingConfigRequest, -) -from .types.session import ( - FileCharacteristics, - FileMetadata, - FileSource, - FileView, - ImageCharacteristics, - Query, - Session, - VideoCharacteristics, -) -from .types.session_service import ListFilesRequest, ListFilesResponse -from .types.site_search_engine import SiteSearchEngine, SiteVerificationInfo, TargetSite -from .types.site_search_engine_service import ( - BatchCreateTargetSiteMetadata, - BatchCreateTargetSitesRequest, - BatchCreateTargetSitesResponse, - BatchVerifyTargetSitesMetadata, - BatchVerifyTargetSitesRequest, - BatchVerifyTargetSitesResponse, - CreateTargetSiteMetadata, - CreateTargetSiteRequest, - DeleteTargetSiteMetadata, - DeleteTargetSiteRequest, - DisableAdvancedSiteSearchMetadata, - DisableAdvancedSiteSearchRequest, - DisableAdvancedSiteSearchResponse, - EnableAdvancedSiteSearchMetadata, - EnableAdvancedSiteSearchRequest, - EnableAdvancedSiteSearchResponse, - FetchDomainVerificationStatusRequest, - FetchDomainVerificationStatusResponse, - GetSiteSearchEngineRequest, - GetTargetSiteRequest, - GetUriPatternDocumentDataRequest, - GetUriPatternDocumentDataResponse, - ListTargetSitesRequest, - ListTargetSitesResponse, - RecrawlUrisMetadata, - RecrawlUrisRequest, - RecrawlUrisResponse, - SetUriPatternDocumentDataMetadata, - SetUriPatternDocumentDataRequest, - SetUriPatternDocumentDataResponse, - UpdateTargetSiteMetadata, - UpdateTargetSiteRequest, -) -from .types.user_event import ( - CompletionInfo, - DocumentInfo, - MediaInfo, - PageInfo, - PanelInfo, - SearchInfo, - TransactionInfo, - UserEvent, -) -from .types.user_event_service import CollectUserEventRequest, WriteUserEventRequest +from .types.serving_config_service import GetServingConfigRequest +from .types.serving_config_service import ListServingConfigsRequest +from .types.serving_config_service import ListServingConfigsResponse +from .types.serving_config_service import UpdateServingConfigRequest +from .types.session import FileCharacteristics +from .types.session import FileMetadata +from .types.session import FileView +from .types.session import ImageCharacteristics +from .types.session import Query +from .types.session import Session +from .types.session import VideoCharacteristics +from .types.session import FileSource +from .types.session_service import ListFilesRequest +from .types.session_service import ListFilesResponse +from .types.site_search_engine import SiteSearchEngine +from .types.site_search_engine import SiteVerificationInfo +from .types.site_search_engine import TargetSite +from .types.site_search_engine_service import BatchCreateTargetSiteMetadata +from .types.site_search_engine_service import BatchCreateTargetSitesRequest +from .types.site_search_engine_service import BatchCreateTargetSitesResponse +from .types.site_search_engine_service import BatchVerifyTargetSitesMetadata +from .types.site_search_engine_service import BatchVerifyTargetSitesRequest +from .types.site_search_engine_service import BatchVerifyTargetSitesResponse +from .types.site_search_engine_service import CreateTargetSiteMetadata +from .types.site_search_engine_service import CreateTargetSiteRequest +from .types.site_search_engine_service import DeleteTargetSiteMetadata +from .types.site_search_engine_service import DeleteTargetSiteRequest +from .types.site_search_engine_service import DisableAdvancedSiteSearchMetadata +from .types.site_search_engine_service import DisableAdvancedSiteSearchRequest +from .types.site_search_engine_service import DisableAdvancedSiteSearchResponse +from .types.site_search_engine_service import EnableAdvancedSiteSearchMetadata +from .types.site_search_engine_service import EnableAdvancedSiteSearchRequest +from .types.site_search_engine_service import EnableAdvancedSiteSearchResponse +from .types.site_search_engine_service import FetchDomainVerificationStatusRequest +from .types.site_search_engine_service import FetchDomainVerificationStatusResponse +from .types.site_search_engine_service import GetSiteSearchEngineRequest +from .types.site_search_engine_service import GetTargetSiteRequest +from .types.site_search_engine_service import GetUriPatternDocumentDataRequest +from .types.site_search_engine_service import GetUriPatternDocumentDataResponse +from .types.site_search_engine_service import ListTargetSitesRequest +from .types.site_search_engine_service import ListTargetSitesResponse +from .types.site_search_engine_service import RecrawlUrisMetadata +from .types.site_search_engine_service import RecrawlUrisRequest +from .types.site_search_engine_service import RecrawlUrisResponse +from .types.site_search_engine_service import SetUriPatternDocumentDataMetadata +from .types.site_search_engine_service import SetUriPatternDocumentDataRequest +from .types.site_search_engine_service import SetUriPatternDocumentDataResponse +from .types.site_search_engine_service import UpdateTargetSiteMetadata +from .types.site_search_engine_service import UpdateTargetSiteRequest +from .types.user_event import CompletionInfo +from .types.user_event import DocumentInfo +from .types.user_event import MediaInfo +from .types.user_event import PageInfo +from .types.user_event import PanelInfo +from .types.user_event import SearchInfo +from .types.user_event import TransactionInfo +from .types.user_event import UserEvent +from .types.user_event_service import CollectUserEventRequest +from .types.user_event_service import WriteUserEventRequest __all__ = ( "AclConfigServiceAsyncClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/gapic_version.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/gapic_version.py index 6b356a66811e..fd79d4e761b7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/gapic_version.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.15.0" # {x-release-please-version} +__version__ = "0.4.0" # {x-release-please-version} diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/__init__.py index cd730339d43b..3c5f2380e16f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import AclConfigServiceAsyncClient from .client import AclConfigServiceClient +from .async_client import AclConfigServiceAsyncClient __all__ = ( "AclConfigServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py index d035bf351f59..15b73d602a24 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,33 +29,30 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1alpha.types import acl_config +from google.cloud.discoveryengine_v1alpha.types import acl_config_service +from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import ( - acl_config, - acl_config_service, - common, -) - -from .client import AclConfigServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, AclConfigServiceTransport +from .transports.base import AclConfigServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import AclConfigServiceGrpcAsyncIOTransport +from .client import AclConfigServiceClient try: from google.api_core import client_logging # type: ignore @@ -119,7 +116,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: AclConfigServiceAsyncClient: The constructed client. """ - return AclConfigServiceClient.from_service_account_info.__func__(AclConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + return AclConfigServiceClient.from_service_account_info.__func__( + AclConfigServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +134,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: AclConfigServiceAsyncClient: The constructed client. """ - return AclConfigServiceClient.from_service_account_file.__func__(AclConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return AclConfigServiceClient.from_service_account_file.__func__( + AclConfigServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py index 3dfd53322b7a..b7785d4fc935 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,16 +61,12 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1alpha.types import acl_config +from google.cloud.discoveryengine_v1alpha.types import acl_config_service +from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import ( - acl_config, - acl_config_service, - common, -) - -from .transports.base import DEFAULT_CLIENT_INFO, AclConfigServiceTransport +from .transports.base import AclConfigServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import AclConfigServiceGrpcTransport from .transports.grpc_asyncio import AclConfigServiceGrpcAsyncIOTransport from .transports.rest import AclConfigServiceRestTransport @@ -84,9 +80,7 @@ class AclConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[AclConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[AclConfigServiceTransport]] _transport_registry["grpc"] = AclConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = AclConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = AclConfigServiceRestTransport @@ -607,11 +601,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = AclConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + AclConfigServiceClient._read_environment_variables() + ) self._client_cert_source = AclConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -646,8 +638,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(AclConfigServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/__init__.py index 8e0c67e64951..9438fef5861b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import AclConfigServiceTransport from .grpc import AclConfigServiceGrpcTransport from .grpc_asyncio import AclConfigServiceGrpcAsyncIOTransport -from .rest import AclConfigServiceRestInterceptor, AclConfigServiceRestTransport +from .rest import AclConfigServiceRestTransport +from .rest import AclConfigServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[AclConfigServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py index 618452017c71..0bc09b78dae9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/base.py @@ -16,19 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service +from google.cloud.discoveryengine_v1alpha.types import acl_config +from google.cloud.discoveryengine_v1alpha.types import acl_config_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -213,7 +215,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py index 43d56bd1e0cd..22f41a24a482 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service - -from .base import DEFAULT_CLIENT_INFO, AclConfigServiceTransport +from google.cloud.discoveryengine_v1alpha.types import acl_config +from google.cloud.discoveryengine_v1alpha.types import acl_config_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import AclConfigServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py index 3cdaf8d90c3a..a56050165430 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/grpc_asyncio.py @@ -15,27 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service - -from .base import DEFAULT_CLIENT_INFO, AclConfigServiceTransport +from google.cloud.discoveryengine_v1alpha.types import acl_config +from google.cloud.discoveryengine_v1alpha.types import acl_config_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import AclConfigServiceTransport, DEFAULT_CLIENT_INFO from .grpc import AclConfigServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py index 546972609cc5..efce4d7af36e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest.py @@ -13,27 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1alpha.types import acl_config +from google.cloud.discoveryengine_v1alpha.types import acl_config_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseAclConfigServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -556,9 +563,7 @@ def __call__( Access Control Configuration. """ - http_options = ( - _BaseAclConfigServiceRestTransport._BaseUpdateAclConfig._get_http_options() - ) + http_options = _BaseAclConfigServiceRestTransport._BaseUpdateAclConfig._get_http_options() request, metadata = self._interceptor.pre_update_acl_config( request, metadata @@ -725,9 +730,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseAclConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseAclConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -987,9 +990,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseAclConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseAclConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseAclConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest_base.py index 6cb0bda46066..665a4b694ddd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/acl_config_service/transports/rest_base.py @@ -14,17 +14,20 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import AclConfigServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1alpha.types import acl_config, acl_config_service +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, AclConfigServiceTransport + +from google.cloud.discoveryengine_v1alpha.types import acl_config +from google.cloud.discoveryengine_v1alpha.types import acl_config_service +from google.longrunning import operations_pb2 # type: ignore class _BaseAclConfigServiceRestTransport(AclConfigServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/__init__.py index 554df3af4d4f..30276121c13b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ChunkServiceAsyncClient from .client import ChunkServiceClient +from .async_client import ChunkServiceAsyncClient __all__ = ( "ChunkServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py index 7960129d3aeb..35c344d2784e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,31 +29,31 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1alpha.services.chunk_service import pagers +from google.cloud.discoveryengine_v1alpha.types import chunk +from google.cloud.discoveryengine_v1alpha.types import chunk_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.services.chunk_service import pagers -from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service - -from .client import ChunkServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ChunkServiceTransport +from .transports.base import ChunkServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ChunkServiceGrpcAsyncIOTransport +from .client import ChunkServiceClient try: from google.api_core import client_logging # type: ignore @@ -118,7 +118,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ChunkServiceAsyncClient: The constructed client. """ - return ChunkServiceClient.from_service_account_info.__func__(ChunkServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ChunkServiceClient.from_service_account_info.__func__( + ChunkServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -134,7 +136,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ChunkServiceAsyncClient: The constructed client. """ - return ChunkServiceClient.from_service_account_file.__func__(ChunkServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ChunkServiceClient.from_service_account_file.__func__( + ChunkServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py index 54952471aac3..6abdcd3a6b82 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,14 +61,13 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1alpha.services.chunk_service import pagers +from google.cloud.discoveryengine_v1alpha.types import chunk +from google.cloud.discoveryengine_v1alpha.types import chunk_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.services.chunk_service import pagers -from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service - -from .transports.base import DEFAULT_CLIENT_INFO, ChunkServiceTransport +from .transports.base import ChunkServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ChunkServiceGrpcTransport from .transports.grpc_asyncio import ChunkServiceGrpcAsyncIOTransport from .transports.rest import ChunkServiceRestTransport @@ -639,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ChunkServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ChunkServiceClient._read_environment_variables() + ) self._client_cert_source = ChunkServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ChunkServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py index d149f9181cf4..a101da7e842c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service +from google.cloud.discoveryengine_v1alpha.types import chunk +from google.cloud.discoveryengine_v1alpha.types import chunk_service class ListChunksPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/__init__.py index d2ed71755e9d..110c30966a5c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import ChunkServiceTransport from .grpc import ChunkServiceGrpcTransport from .grpc_asyncio import ChunkServiceGrpcAsyncIOTransport -from .rest import ChunkServiceRestInterceptor, ChunkServiceRestTransport +from .rest import ChunkServiceRestTransport +from .rest import ChunkServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ChunkServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py index fb7b439bfdb8..c9393100ac7c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/base.py @@ -16,19 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service +from google.cloud.discoveryengine_v1alpha.types import chunk +from google.cloud.discoveryengine_v1alpha.types import chunk_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -215,7 +217,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py index 46433ded4f84..d5a69d7793da 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service - -from .base import DEFAULT_CLIENT_INFO, ChunkServiceTransport +from google.cloud.discoveryengine_v1alpha.types import chunk +from google.cloud.discoveryengine_v1alpha.types import chunk_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ChunkServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py index 5698a2ab1916..188b8c0404bc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/grpc_asyncio.py @@ -15,27 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service - -from .base import DEFAULT_CLIENT_INFO, ChunkServiceTransport +from google.cloud.discoveryengine_v1alpha.types import chunk +from google.cloud.discoveryengine_v1alpha.types import chunk_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ChunkServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ChunkServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py index 1a05ebd9eaeb..b4288d43a3b7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest.py @@ -13,27 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1alpha.types import chunk +from google.cloud.discoveryengine_v1alpha.types import chunk_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseChunkServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest_base.py index 524f7cc817ae..3f4414eb7c30 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/chunk_service/transports/rest_base.py @@ -14,17 +14,20 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ChunkServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, ChunkServiceTransport + +from google.cloud.discoveryengine_v1alpha.types import chunk +from google.cloud.discoveryengine_v1alpha.types import chunk_service +from google.longrunning import operations_pb2 # type: ignore class _BaseChunkServiceRestTransport(ChunkServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/__init__.py index 58eb7a9f0042..480b61be40da 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import CompletionServiceAsyncClient from .client import CompletionServiceClient +from .async_client import CompletionServiceAsyncClient __all__ = ( "CompletionServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py index 664c2c4995ec..607edb80857a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,18 +47,14 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.types import completion_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import ( - completion_service, - import_config, - purge_config, -) - -from .client import CompletionServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from .transports.base import CompletionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import CompletionServiceGrpcAsyncIOTransport +from .client import CompletionServiceClient try: from google.api_core import client_logging # type: ignore @@ -121,7 +118,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_info.__func__(CompletionServiceAsyncClient, info, *args, **kwargs) # type: ignore + return CompletionServiceClient.from_service_account_info.__func__( + CompletionServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -137,7 +136,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_file.__func__(CompletionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return CompletionServiceClient.from_service_account_file.__func__( + CompletionServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py index 8b451d6f52f1..798bdc95fa25 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,16 +63,12 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.types import completion_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import ( - completion_service, - import_config, - purge_config, -) - -from .transports.base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from .transports.base import CompletionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import CompletionServiceGrpcTransport from .transports.grpc_asyncio import CompletionServiceGrpcAsyncIOTransport from .transports.rest import CompletionServiceRestTransport @@ -86,9 +82,7 @@ class CompletionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompletionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] _transport_registry["grpc"] = CompletionServiceGrpcTransport _transport_registry["grpc_asyncio"] = CompletionServiceGrpcAsyncIOTransport _transport_registry["rest"] = CompletionServiceRestTransport @@ -614,11 +608,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompletionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompletionServiceClient._read_environment_variables() + ) self._client_cert_source = CompletionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -653,8 +645,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompletionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/__init__.py index 20f1ed5f3637..7177c73e997f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import CompletionServiceTransport from .grpc import CompletionServiceGrpcTransport from .grpc_asyncio import CompletionServiceGrpcAsyncIOTransport -from .rest import CompletionServiceRestInterceptor, CompletionServiceRestTransport +from .rest import CompletionServiceRestTransport +from .rest import CompletionServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py index 85753e9da351..f3719f7d2745 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/base.py @@ -16,23 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import ( - completion_service, - import_config, - purge_config, -) +from google.cloud.discoveryengine_v1alpha.types import completion_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -267,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py index e45e1cf97665..16f5e642b100 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc.py @@ -16,27 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - completion_service, - import_config, - purge_config, -) - -from .base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from google.cloud.discoveryengine_v1alpha.types import completion_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import CompletionServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -398,12 +398,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -431,12 +431,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -463,12 +463,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -495,12 +495,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py index 7959c031d026..0398566159e4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/grpc_asyncio.py @@ -15,31 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - completion_service, - import_config, - purge_config, -) - -from .base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from google.cloud.discoveryengine_v1alpha.types import completion_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import CompletionServiceTransport, DEFAULT_CLIENT_INFO from .grpc import CompletionServiceGrpcTransport try: @@ -407,12 +407,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -441,12 +441,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -474,12 +474,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -507,12 +507,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py index da9b8ec81c86..ed959e82ee47 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest.py @@ -13,31 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1alpha.types import completion_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - completion_service, - import_config, - purge_config, -) -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseCompletionServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -765,9 +770,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_complete_query(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_transcoded_request( @@ -919,9 +922,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_import_completion_suggestions( request, metadata @@ -988,11 +989,10 @@ def __call__( resp = self._interceptor.post_import_completion_suggestions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_completion_suggestions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_completion_suggestions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1081,15 +1081,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_import_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_import_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1153,11 +1150,10 @@ def __call__( resp = self._interceptor.post_import_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1244,9 +1240,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_purge_completion_suggestions( request, metadata @@ -1401,15 +1395,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_purge_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_purge_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1473,11 +1464,10 @@ def __call__( resp = self._interceptor.post_purge_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1521,7 +1511,9 @@ def import_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_suggestion_deny_list_entries( @@ -1531,7 +1523,9 @@ def import_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ImportSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_completion_suggestions( @@ -1541,7 +1535,9 @@ def purge_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_suggestion_deny_list_entries( @@ -1551,7 +1547,9 @@ def purge_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -1609,9 +1607,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1731,9 +1727,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1872,9 +1866,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest_base.py index e4b25d9406a0..ca9af230a016 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/completion_service/transports/rest_base.py @@ -14,21 +14,21 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import CompletionServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1alpha.types import ( - completion_service, - import_config, - purge_config, -) +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, CompletionServiceTransport + +from google.cloud.discoveryengine_v1alpha.types import completion_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.longrunning import operations_pb2 # type: ignore class _BaseCompletionServiceRestTransport(CompletionServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/__init__.py index d5bd8f14f952..b0aec3b84b78 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ControlServiceAsyncClient from .client import ControlServiceClient +from .async_client import ControlServiceAsyncClient __all__ = ( "ControlServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py index e207dc52b9f7..b28939dafb88 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,34 +29,33 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.control_service import pagers from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.discoveryengine_v1alpha.types import control from google.cloud.discoveryengine_v1alpha.types import control as gcd_control from google.cloud.discoveryengine_v1alpha.types import control_service - -from .client import ControlServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from .transports.base import ControlServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ControlServiceGrpcAsyncIOTransport +from .client import ControlServiceClient try: from google.api_core import client_logging # type: ignore @@ -126,7 +125,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_info.__func__(ControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ControlServiceClient.from_service_account_info.__func__( + ControlServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_file.__func__(ControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ControlServiceClient.from_service_account_file.__func__( + ControlServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -617,8 +620,8 @@ async def sample_update_control(): [Control][google.cloud.discoveryengine.v1alpha.Control] to update. The following are NOT supported: - - [Control.name][google.cloud.discoveryengine.v1alpha.Control.name] - - [Control.solution_type][google.cloud.discoveryengine.v1alpha.Control.solution_type] + - [Control.name][google.cloud.discoveryengine.v1alpha.Control.name] + - [Control.solution_type][google.cloud.discoveryengine.v1alpha.Control.solution_type] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py index b3f1a5a38e84..6b9b91fa96fb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,17 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.control_service import pagers from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.discoveryengine_v1alpha.types import control from google.cloud.discoveryengine_v1alpha.types import control as gcd_control from google.cloud.discoveryengine_v1alpha.types import control_service - -from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from .transports.base import ControlServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ControlServiceGrpcTransport from .transports.grpc_asyncio import ControlServiceGrpcAsyncIOTransport from .transports.rest import ControlServiceRestTransport @@ -85,9 +83,7 @@ class ControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] _transport_registry["grpc"] = ControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = ControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = ControlServiceRestTransport @@ -637,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ControlServiceClient._read_environment_variables() + ) self._client_cert_source = ControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -676,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ControlServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1056,8 +1049,8 @@ def sample_update_control(): [Control][google.cloud.discoveryengine.v1alpha.Control] to update. The following are NOT supported: - - [Control.name][google.cloud.discoveryengine.v1alpha.Control.name] - - [Control.solution_type][google.cloud.discoveryengine.v1alpha.Control.solution_type] + - [Control.name][google.cloud.discoveryengine.v1alpha.Control.name] + - [Control.solution_type][google.cloud.discoveryengine.v1alpha.Control.solution_type] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py index 4fdfefa8c941..4580f605e7a0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import control, control_service +from google.cloud.discoveryengine_v1alpha.types import control +from google.cloud.discoveryengine_v1alpha.types import control_service class ListControlsPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/__init__.py index 3e0b9c56088b..4c3c6cfd5dbb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import ControlServiceTransport from .grpc import ControlServiceGrpcTransport from .grpc_asyncio import ControlServiceGrpcAsyncIOTransport -from .rest import ControlServiceRestInterceptor, ControlServiceRestTransport +from .rest import ControlServiceRestTransport +from .rest import ControlServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py index f14cb0b0db9b..0b5ab1732026 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/base.py @@ -16,22 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import control from google.cloud.discoveryengine_v1alpha.types import control as gcd_control from google.cloud.discoveryengine_v1alpha.types import control_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -261,7 +262,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py index 62991007eaaa..104068887aec 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc.py @@ -16,26 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import control from google.cloud.discoveryengine_v1alpha.types import control as gcd_control from google.cloud.discoveryengine_v1alpha.types import control_service - -from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ControlServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py index d7c20e6d8b90..2864088ce148 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/grpc_asyncio.py @@ -15,30 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1alpha.types import control from google.cloud.discoveryengine_v1alpha.types import control as gcd_control from google.cloud.discoveryengine_v1alpha.types import control_service - -from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ControlServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ControlServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py index 11b7c06ce997..aee72a72b960 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest.py @@ -13,30 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1alpha.types import control from google.cloud.discoveryengine_v1alpha.types import control as gcd_control from google.cloud.discoveryengine_v1alpha.types import control_service +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseControlServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -1295,9 +1301,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py index d1e9cc380bc6..d307f66dd95b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/control_service/transports/rest_base.py @@ -14,20 +14,22 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ControlServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import control from google.cloud.discoveryengine_v1alpha.types import control as gcd_control from google.cloud.discoveryengine_v1alpha.types import control_service - -from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseControlServiceRestTransport(ControlServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/__init__.py index 733efd06389f..504962bdc81a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ConversationalSearchServiceAsyncClient from .client import ConversationalSearchServiceClient +from .async_client import ConversationalSearchServiceAsyncClient __all__ = ( "ConversationalSearchServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py index 5a0ed037092d..379fe8d86c19 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,42 +29,39 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( pagers, ) -from google.cloud.discoveryengine_v1alpha.types import ( - conversational_search_service, - search_service, -) -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1alpha.types import answer from google.cloud.discoveryengine_v1alpha.types import conversation +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service +from google.cloud.discoveryengine_v1alpha.types import search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session - -from .client import ConversationalSearchServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ConversationalSearchServiceGrpcAsyncIOTransport +from .client import ConversationalSearchServiceClient try: from google.api_core import client_logging # type: ignore @@ -164,7 +161,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_info.__func__(ConversationalSearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ConversationalSearchServiceClient.from_service_account_info.__func__( + ConversationalSearchServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -180,7 +179,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_file.__func__(ConversationalSearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ConversationalSearchServiceClient.from_service_account_file.__func__( + ConversationalSearchServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -218,7 +219,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationalSearchServiceTransport: @@ -767,7 +770,7 @@ async def sample_update_conversation(): [Conversation][google.cloud.discoveryengine.v1alpha.Conversation] to update. The following are NOT supported: - - [Conversation.name][google.cloud.discoveryengine.v1alpha.Conversation.name] + - [Conversation.name][google.cloud.discoveryengine.v1alpha.Conversation.name] If not set or empty, all supported fields are updated. @@ -1578,7 +1581,7 @@ async def sample_update_session(): [Session][google.cloud.discoveryengine.v1alpha.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1alpha.Session.name] + - [Session.name][google.cloud.discoveryengine.v1alpha.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py index b2176d642e37..72045e6565a4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,25 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( pagers, ) -from google.cloud.discoveryengine_v1alpha.types import ( - conversational_search_service, - search_service, -) -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1alpha.types import answer from google.cloud.discoveryengine_v1alpha.types import conversation +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service +from google.cloud.discoveryengine_v1alpha.types import search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session - -from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ConversationalSearchServiceGrpcTransport from .transports.grpc_asyncio import ConversationalSearchServiceGrpcAsyncIOTransport from .transports.rest import ConversationalSearchServiceRestTransport @@ -93,13 +89,11 @@ class ConversationalSearchServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationalSearchServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ConversationalSearchServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ConversationalSearchServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ConversationalSearchServiceRestTransport def get_transport_class( @@ -779,11 +773,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationalSearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationalSearchServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConversationalSearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -820,8 +812,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationalSearchServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1308,7 +1299,7 @@ def sample_update_conversation(): [Conversation][google.cloud.discoveryengine.v1alpha.Conversation] to update. The following are NOT supported: - - [Conversation.name][google.cloud.discoveryengine.v1alpha.Conversation.name] + - [Conversation.name][google.cloud.discoveryengine.v1alpha.Conversation.name] If not set or empty, all supported fields are updated. @@ -2099,7 +2090,7 @@ def sample_update_session(): [Session][google.cloud.discoveryengine.v1alpha.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1alpha.Session.name] + - [Session.name][google.cloud.discoveryengine.v1alpha.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py index b6329666a180..159e01232eb5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,11 +37,9 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - conversation, - conversational_search_service, - session, -) +from google.cloud.discoveryengine_v1alpha.types import conversation +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service +from google.cloud.discoveryengine_v1alpha.types import session class ListConversationsPager: @@ -71,7 +68,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py index 855e35aad0c0..88c3053fe65f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import ConversationalSearchServiceTransport from .grpc import ConversationalSearchServiceGrpcTransport from .grpc_asyncio import ConversationalSearchServiceGrpcAsyncIOTransport -from .rest import ( - ConversationalSearchServiceRestInterceptor, - ConversationalSearchServiceRestTransport, -) +from .rest import ConversationalSearchServiceRestTransport +from .rest import ConversationalSearchServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationalSearchServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConversationalSearchServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConversationalSearchServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py index ceac47d07e18..51843016f81e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/base.py @@ -16,25 +16,26 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import answer from google.cloud.discoveryengine_v1alpha.types import conversation +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -385,7 +386,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py index dfef0082e569..1c33cc77c4b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc.py @@ -16,29 +16,30 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import answer from google.cloud.discoveryengine_v1alpha.types import conversation +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py index d7ce30c63f09..fa4392b6dca7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/grpc_asyncio.py @@ -15,33 +15,34 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import answer from google.cloud.discoveryengine_v1alpha.types import conversation +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ConversationalSearchServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py index 95bdbd1bbd07..0090f97891f6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest.py @@ -13,33 +13,39 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import answer from google.cloud.discoveryengine_v1alpha.types import conversation +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationalSearchServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -977,9 +983,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_answer_query(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_transcoded_request( @@ -1139,9 +1143,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() request, metadata = self._interceptor.pre_converse_conversation( request, metadata @@ -1299,9 +1301,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1452,9 +1452,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_transcoded_request( @@ -1601,9 +1599,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1710,9 +1706,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_transcoded_request( @@ -1823,9 +1817,7 @@ def __call__( Defines an answer. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() request, metadata = self._interceptor.pre_get_answer(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_transcoded_request( @@ -1972,9 +1964,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -2121,9 +2111,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() request, metadata = self._interceptor.pre_get_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_transcoded_request( @@ -2270,9 +2258,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2421,9 +2407,7 @@ def __call__( Response for ListSessions method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_transcoded_request( @@ -2576,9 +2560,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -2729,9 +2711,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() request, metadata = self._interceptor.pre_update_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_transcoded_request( @@ -3015,9 +2995,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3140,9 +3118,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3283,9 +3259,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py index da084da104dc..9a4acd9ab184 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/conversational_search_service/transports/rest_base.py @@ -14,23 +14,25 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import answer from google.cloud.discoveryengine_v1alpha.types import conversation +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseConversationalSearchServiceRestTransport( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/__init__.py index aaea8b56ac8a..b8c5d59ab4e4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import DataStoreServiceAsyncClient from .client import DataStoreServiceClient +from .async_client import DataStoreServiceAsyncClient __all__ = ( "DataStoreServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py index f7fe424c9fb2..a07c9a117d63 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,26 +47,24 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.data_store_service import pagers +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import data_store from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import schema - -from .client import DataStoreServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import DataStoreServiceGrpcAsyncIOTransport +from .client import DataStoreServiceClient try: from google.api_core import client_logging # type: ignore @@ -142,7 +141,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_info.__func__(DataStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + return DataStoreServiceClient.from_service_account_info.__func__( + DataStoreServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -158,7 +159,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_file.__func__(DataStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return DataStoreServiceClient.from_service_account_file.__func__( + DataStoreServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -1240,7 +1243,7 @@ async def sample_update_document_processing_config(): [DocumentProcessingConfig][google.cloud.discoveryengine.v1alpha.DocumentProcessingConfig] to update. The following are the only supported fields: - - [DocumentProcessingConfig.ocr_config][google.cloud.discoveryengine.v1alpha.DocumentProcessingConfig.ocr_config] + - [DocumentProcessingConfig.ocr_config][google.cloud.discoveryengine.v1alpha.DocumentProcessingConfig.ocr_config] If not set, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py index 5745c9ac53d2..d2eaa9a285b1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,24 +63,22 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.data_store_service import pagers +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import data_store from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import schema - -from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import DataStoreServiceGrpcTransport from .transports.grpc_asyncio import DataStoreServiceGrpcAsyncIOTransport from .transports.rest import DataStoreServiceRestTransport @@ -94,9 +92,7 @@ class DataStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] _transport_registry["grpc"] = DataStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataStoreServiceRestTransport @@ -693,11 +689,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataStoreServiceClient._read_environment_variables() + ) self._client_cert_source = DataStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -732,8 +726,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataStoreServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1708,7 +1701,7 @@ def sample_update_document_processing_config(): [DocumentProcessingConfig][google.cloud.discoveryengine.v1alpha.DocumentProcessingConfig] to update. The following are the only supported fields: - - [DocumentProcessingConfig.ocr_config][google.cloud.discoveryengine.v1alpha.DocumentProcessingConfig.ocr_config] + - [DocumentProcessingConfig.ocr_config][google.cloud.discoveryengine.v1alpha.DocumentProcessingConfig.ocr_config] If not set, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py index bf1af67548e6..54422857c576 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import data_store, data_store_service +from google.cloud.discoveryengine_v1alpha.types import data_store +from google.cloud.discoveryengine_v1alpha.types import data_store_service class ListDataStoresPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/__init__.py index 70a5571eccbe..9230588b12ff 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import DataStoreServiceTransport from .grpc import DataStoreServiceGrpcTransport from .grpc_asyncio import DataStoreServiceGrpcAsyncIOTransport -from .rest import DataStoreServiceRestInterceptor, DataStoreServiceRestTransport +from .rest import DataStoreServiceRestTransport +from .rest import DataStoreServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py index 1ef1fbe7031d..b7f3d5518b54 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/base.py @@ -16,25 +16,27 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import data_store from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -303,7 +305,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py index 6b4a0fe42fa0..096023e01c8c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc.py @@ -16,29 +16,31 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import data_store from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service - -from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -522,12 +524,12 @@ def get_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_document_processing_config" not in self._stubs: - self._stubs[ - "get_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", - request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, - response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["get_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", + request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, + response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["get_document_processing_config"] @@ -562,12 +564,12 @@ def update_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_document_processing_config" not in self._stubs: - self._stubs[ - "update_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", - request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, - response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["update_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", + request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, + response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["update_document_processing_config"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py index be0a75a2844a..db8aa34f9c3d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/grpc_asyncio.py @@ -15,33 +15,35 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore +from google.cloud.discoveryengine_v1alpha.types import data_store from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service - -from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO from .grpc import DataStoreServiceGrpcTransport try: @@ -532,12 +534,12 @@ def get_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_document_processing_config" not in self._stubs: - self._stubs[ - "get_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", - request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, - response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["get_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/GetDocumentProcessingConfig", + request_serializer=data_store_service.GetDocumentProcessingConfigRequest.serialize, + response_deserializer=document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["get_document_processing_config"] @@ -572,12 +574,12 @@ def update_document_processing_config( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "update_document_processing_config" not in self._stubs: - self._stubs[ - "update_document_processing_config" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", - request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, - response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + self._stubs["update_document_processing_config"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DataStoreService/UpdateDocumentProcessingConfig", + request_serializer=data_store_service.UpdateDocumentProcessingConfigRequest.serialize, + response_deserializer=gcd_document_processing_config.DocumentProcessingConfig.deserialize, + ) ) return self._stubs["update_document_processing_config"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py index 3c5e0577ef4b..9d7726e32169 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest.py @@ -13,33 +13,40 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.cloud.discoveryengine_v1alpha.types import data_store from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataStoreServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -890,9 +897,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() request, metadata = self._interceptor.pre_create_data_store( request, metadata @@ -1045,9 +1050,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() request, metadata = self._interceptor.pre_delete_data_store( request, metadata @@ -1349,9 +1352,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseGetDocumentProcessingConfig._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseGetDocumentProcessingConfig._get_http_options() request, metadata = self._interceptor.pre_get_document_processing_config( request, metadata @@ -1415,11 +1416,10 @@ def __call__( resp = self._interceptor.post_get_document_processing_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_document_processing_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_document_processing_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1507,9 +1507,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() request, metadata = self._interceptor.pre_list_data_stores( request, metadata @@ -1661,9 +1659,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() request, metadata = self._interceptor.pre_update_data_store( request, metadata @@ -1825,9 +1821,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDocumentProcessingConfig._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDocumentProcessingConfig._get_http_options() request, metadata = self._interceptor.pre_update_document_processing_config( request, metadata @@ -1896,11 +1890,10 @@ def __call__( resp = self._interceptor.post_update_document_processing_config(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_update_document_processing_config_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_update_document_processing_config_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1966,7 +1959,9 @@ def get_document_processing_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetDocumentProcessingConfig(self._session, self._host, self._interceptor) # type: ignore + return self._GetDocumentProcessingConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_data_stores( @@ -1998,7 +1993,9 @@ def update_document_processing_config( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._UpdateDocumentProcessingConfig(self._session, self._host, self._interceptor) # type: ignore + return self._UpdateDocumentProcessingConfig( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -2056,9 +2053,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2318,9 +2313,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py index a651b272c3a3..eabfc0f20c41 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/data_store_service/transports/rest_base.py @@ -14,23 +14,25 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format +from google.cloud.discoveryengine_v1alpha.types import data_store from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service - -from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseDataStoreServiceRestTransport(DataStoreServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/__init__.py index 0bd096115c9e..4d6f3ee464d0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import DocumentServiceAsyncClient from .client import DocumentServiceClient +from .async_client import DocumentServiceAsyncClient __all__ = ( "DocumentServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py index 967e825c1fc6..94c73465ef0a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,24 +47,20 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.services.document_service import pagers +from google.cloud.discoveryengine_v1alpha.types import document +from google.cloud.discoveryengine_v1alpha.types import document as gcd_document +from google.cloud.discoveryengine_v1alpha.types import document_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.services.document_service import pagers -from google.cloud.discoveryengine_v1alpha.types import ( - document_service, - import_config, - purge_config, -) -from google.cloud.discoveryengine_v1alpha.types import document -from google.cloud.discoveryengine_v1alpha.types import document as gcd_document - -from .client import DocumentServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from .transports.base import DocumentServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import DocumentServiceGrpcAsyncIOTransport +from .client import DocumentServiceClient try: from google.api_core import client_logging # type: ignore @@ -134,7 +131,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + return DocumentServiceClient.from_service_account_info.__func__( + DocumentServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +149,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return DocumentServiceClient.from_service_account_file.__func__( + DocumentServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py index 6e91ecc3fe65..6c576131577a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,22 +63,18 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.services.document_service import pagers +from google.cloud.discoveryengine_v1alpha.types import document +from google.cloud.discoveryengine_v1alpha.types import document as gcd_document +from google.cloud.discoveryengine_v1alpha.types import document_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.services.document_service import pagers -from google.cloud.discoveryengine_v1alpha.types import ( - document_service, - import_config, - purge_config, -) -from google.cloud.discoveryengine_v1alpha.types import document -from google.cloud.discoveryengine_v1alpha.types import document as gcd_document - -from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from .transports.base import DocumentServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import DocumentServiceGrpcTransport from .transports.grpc_asyncio import DocumentServiceGrpcAsyncIOTransport from .transports.rest import DocumentServiceRestTransport @@ -92,9 +88,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -673,11 +667,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -712,8 +704,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py index a6d2f86a14a2..9c48311a5289 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import document, document_service +from google.cloud.discoveryengine_v1alpha.types import document +from google.cloud.discoveryengine_v1alpha.types import document_service class ListDocumentsPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/__init__.py index 08578a95ea6d..de821c2b2022 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import DocumentServiceTransport from .grpc import DocumentServiceGrpcTransport from .grpc_asyncio import DocumentServiceGrpcAsyncIOTransport -from .rest import DocumentServiceRestInterceptor, DocumentServiceRestTransport +from .rest import DocumentServiceRestTransport +from .rest import DocumentServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py index 0ff60c3c5f1d..4a9a7de7d685 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/base.py @@ -16,26 +16,26 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document +from google.cloud.discoveryengine_v1alpha.types import document_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -338,7 +338,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py index 5e7fa066e5ff..9714e641d1ae 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc.py @@ -16,30 +16,30 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document - -from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from google.cloud.discoveryengine_v1alpha.types import document_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import DocumentServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -616,12 +616,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py index d9ac56379040..07aef91549c7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/grpc_asyncio.py @@ -15,34 +15,34 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document - -from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from google.cloud.discoveryengine_v1alpha.types import document_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import DocumentServiceTransport, DEFAULT_CLIENT_INFO from .grpc import DocumentServiceGrpcTransport try: @@ -634,12 +634,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py index c91818db2d7f..efb691250e93 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest.py @@ -13,34 +13,39 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + -from google.cloud.discoveryengine_v1alpha.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document +from google.cloud.discoveryengine_v1alpha.types import document_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -955,9 +960,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() request, metadata = self._interceptor.pre_batch_get_documents_metadata( request, metadata @@ -1113,9 +1116,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -1260,9 +1261,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -1525,9 +1524,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseGetProcessedDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseGetProcessedDocument._get_http_options() request, metadata = self._interceptor.pre_get_processed_document( request, metadata @@ -1675,9 +1672,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1981,9 +1976,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() request, metadata = self._interceptor.pre_purge_documents(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_transcoded_request( @@ -2134,9 +2127,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -2238,7 +2229,9 @@ def batch_get_documents_metadata( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchGetDocumentsMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetDocumentsMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_document( @@ -2363,9 +2356,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2625,9 +2616,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py index 169f1a83cbbe..3af78305aaeb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/document_service/transports/rest_base.py @@ -14,24 +14,24 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import DocumentServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format -from google.cloud.discoveryengine_v1alpha.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1alpha.types import document from google.cloud.discoveryengine_v1alpha.types import document as gcd_document - -from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from google.cloud.discoveryengine_v1alpha.types import document_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseDocumentServiceRestTransport(DocumentServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/__init__.py index f028860e65ae..e6da99d73e86 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import EngineServiceAsyncClient from .client import EngineServiceClient +from .async_client import EngineServiceAsyncClient __all__ = ( "EngineServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py index 6c654fc9e890..dd0cf07662ab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,21 +47,19 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.engine_service import pagers from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.discoveryengine_v1alpha.types import engine from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine from google.cloud.discoveryengine_v1alpha.types import engine_service - -from .client import EngineServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import EngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import EngineServiceGrpcAsyncIOTransport +from .client import EngineServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +127,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_info.__func__(EngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + return EngineServiceClient.from_service_account_info.__func__( + EngineServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_file.__func__(EngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return EngineServiceClient.from_service_account_file.__func__( + EngineServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py index a01cd08a95c2..19355f711bdd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,19 +63,17 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.engine_service import pagers from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.discoveryengine_v1alpha.types import engine from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine from google.cloud.discoveryengine_v1alpha.types import engine_service - -from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import EngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import EngineServiceGrpcTransport from .transports.grpc_asyncio import EngineServiceGrpcAsyncIOTransport from .transports.rest import EngineServiceRestTransport @@ -639,11 +637,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EngineServiceClient._read_environment_variables() + ) self._client_cert_source = EngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +674,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py index 50ef5dbbc624..d6df4c84ee36 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import engine, engine_service +from google.cloud.discoveryengine_v1alpha.types import engine +from google.cloud.discoveryengine_v1alpha.types import engine_service class ListEnginesPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/__init__.py index b4ffb09de4fe..196454992873 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import EngineServiceTransport from .grpc import EngineServiceGrpcTransport from .grpc_asyncio import EngineServiceGrpcAsyncIOTransport -from .rest import EngineServiceRestInterceptor, EngineServiceRestTransport +from .rest import EngineServiceRestTransport +from .rest import EngineServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[EngineServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py index 3150765e8df8..a218aa5da080 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/base.py @@ -16,21 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import engine from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine from google.cloud.discoveryengine_v1alpha.types import engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -307,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py index 804660e8de71..173f4cc858aa 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import engine from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine from google.cloud.discoveryengine_v1alpha.types import engine_service - -from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EngineServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py index e31cf83803e6..7619ad402234 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/grpc_asyncio.py @@ -15,29 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1alpha.types import engine from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine from google.cloud.discoveryengine_v1alpha.types import engine_service - -from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EngineServiceTransport, DEFAULT_CLIENT_INFO from .grpc import EngineServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py index ebf00ce3ec1e..b179684fe3f8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest.py @@ -13,29 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1alpha.types import engine from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine from google.cloud.discoveryengine_v1alpha.types import engine_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEngineServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py index 3ad4bdc6c541..e1c4142b4431 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/engine_service/transports/rest_base.py @@ -14,19 +14,21 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import EngineServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import engine from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine from google.cloud.discoveryengine_v1alpha.types import engine_service - -from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseEngineServiceRestTransport(EngineServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/__init__.py index 4eea03a4e934..e78603a32fd1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import EstimateBillingServiceAsyncClient from .client import EstimateBillingServiceClient +from .async_client import EstimateBillingServiceAsyncClient __all__ = ( "EstimateBillingServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py index 55863e8bcacd..f74a06c4a22e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,14 +47,12 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service - -from .client import EstimateBillingServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, EstimateBillingServiceTransport +from .transports.base import EstimateBillingServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import EstimateBillingServiceGrpcAsyncIOTransport +from .client import EstimateBillingServiceClient try: from google.api_core import client_logging # type: ignore @@ -119,7 +118,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EstimateBillingServiceAsyncClient: The constructed client. """ - return EstimateBillingServiceClient.from_service_account_info.__func__(EstimateBillingServiceAsyncClient, info, *args, **kwargs) # type: ignore + return EstimateBillingServiceClient.from_service_account_info.__func__( + EstimateBillingServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +136,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EstimateBillingServiceAsyncClient: The constructed client. """ - return EstimateBillingServiceClient.from_service_account_file.__func__(EstimateBillingServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return EstimateBillingServiceClient.from_service_account_file.__func__( + EstimateBillingServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -173,7 +176,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return EstimateBillingServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return EstimateBillingServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> EstimateBillingServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py index 295d28caae98..3d8b4b19a347 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,12 +63,10 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service - -from .transports.base import DEFAULT_CLIENT_INFO, EstimateBillingServiceTransport +from .transports.base import EstimateBillingServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import EstimateBillingServiceGrpcTransport from .transports.grpc_asyncio import EstimateBillingServiceGrpcAsyncIOTransport from .transports.rest import EstimateBillingServiceRestTransport @@ -82,9 +80,7 @@ class EstimateBillingServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EstimateBillingServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EstimateBillingServiceTransport]] _transport_registry["grpc"] = EstimateBillingServiceGrpcTransport _transport_registry["grpc_asyncio"] = EstimateBillingServiceGrpcAsyncIOTransport _transport_registry["rest"] = EstimateBillingServiceRestTransport @@ -607,11 +603,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EstimateBillingServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EstimateBillingServiceClient._read_environment_variables() + ) self._client_cert_source = EstimateBillingServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -646,8 +640,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EstimateBillingServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py index 3a94a649d916..e592c6306fe9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import EstimateBillingServiceTransport from .grpc import EstimateBillingServiceGrpcTransport from .grpc_asyncio import EstimateBillingServiceGrpcAsyncIOTransport -from .rest import ( - EstimateBillingServiceRestInterceptor, - EstimateBillingServiceRestTransport, -) +from .rest import EstimateBillingServiceRestTransport +from .rest import EstimateBillingServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[EstimateBillingServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[EstimateBillingServiceTransport]] _transport_registry["grpc"] = EstimateBillingServiceGrpcTransport _transport_registry["grpc_asyncio"] = EstimateBillingServiceGrpcAsyncIOTransport _transport_registry["rest"] = EstimateBillingServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py index db8681250764..0ee82f59ea66 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/base.py @@ -16,19 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -204,7 +206,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py index b8595639994d..cb318a3aeffc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service - -from .base import DEFAULT_CLIENT_INFO, EstimateBillingServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EstimateBillingServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py index 81ab1944b72a..043aaaac97c1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/grpc_asyncio.py @@ -15,27 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service - -from .base import DEFAULT_CLIENT_INFO, EstimateBillingServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EstimateBillingServiceTransport, DEFAULT_CLIENT_INFO from .grpc import EstimateBillingServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py index 399c5d25dd0d..f55634f80f0e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest.py @@ -13,27 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEstimateBillingServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -532,9 +539,7 @@ def __call__( """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseEstimateDataSize._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseEstimateDataSize._get_http_options() request, metadata = self._interceptor.pre_estimate_data_size( request, metadata @@ -695,9 +700,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -820,9 +823,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEstimateBillingServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -961,9 +962,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEstimateBillingServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEstimateBillingServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEstimateBillingServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest_base.py index 9cffed7b546b..fde60a2f2e2e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/estimate_billing_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import EstimateBillingServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service - -from .base import DEFAULT_CLIENT_INFO, EstimateBillingServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseEstimateBillingServiceRestTransport(EstimateBillingServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/__init__.py index 9cbde8f5c38c..f2bfe018defb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import EvaluationServiceAsyncClient from .client import EvaluationServiceClient +from .async_client import EvaluationServiceAsyncClient __all__ = ( "EvaluationServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py index 27c72b9a272a..3907fcc3074e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,19 +47,17 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1alpha.types import evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.services.evaluation_service import pagers -from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation_service - -from .client import EvaluationServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport +from .transports.base import EvaluationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import EvaluationServiceGrpcAsyncIOTransport +from .client import EvaluationServiceClient try: from google.api_core import client_logging # type: ignore @@ -144,7 +143,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_info.__func__(EvaluationServiceAsyncClient, info, *args, **kwargs) # type: ignore + return EvaluationServiceClient.from_service_account_info.__func__( + EvaluationServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +161,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_file.__func__(EvaluationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return EvaluationServiceClient.from_service_account_file.__func__( + EvaluationServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py index 4ba0e1bdd446..b590d7908a64 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,17 +63,15 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1alpha.types import evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.services.evaluation_service import pagers -from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation -from google.cloud.discoveryengine_v1alpha.types import evaluation_service - -from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport +from .transports.base import EvaluationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import EvaluationServiceGrpcTransport from .transports.grpc_asyncio import EvaluationServiceGrpcAsyncIOTransport from .transports.rest import EvaluationServiceRestTransport @@ -87,9 +85,7 @@ class EvaluationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EvaluationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EvaluationServiceTransport]] _transport_registry["grpc"] = EvaluationServiceGrpcTransport _transport_registry["grpc_asyncio"] = EvaluationServiceGrpcAsyncIOTransport _transport_registry["rest"] = EvaluationServiceRestTransport @@ -776,11 +772,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EvaluationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EvaluationServiceClient._read_environment_variables() + ) self._client_cert_source = EvaluationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -815,8 +809,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EvaluationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py index daa00c99e2d8..86639e4e4f1f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service +from google.cloud.discoveryengine_v1alpha.types import evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation_service class ListEvaluationsPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/__init__.py index c3cac92e11d7..12617337e606 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import EvaluationServiceTransport from .grpc import EvaluationServiceGrpcTransport from .grpc_asyncio import EvaluationServiceGrpcAsyncIOTransport -from .rest import EvaluationServiceRestInterceptor, EvaluationServiceRestTransport +from .rest import EvaluationServiceRestTransport +from .rest import EvaluationServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[EvaluationServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py index 7bcef19ee806..f260f7ef9e9b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/base.py @@ -16,19 +16,22 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service +from google.cloud.discoveryengine_v1alpha.types import evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -252,7 +255,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py index 344488b60937..455b772e820e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc.py @@ -16,23 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service - -from .base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport +from google.cloud.discoveryengine_v1alpha.types import evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EvaluationServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py index b35d2cf49836..e99d4a535570 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/grpc_asyncio.py @@ -15,27 +15,30 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service - -from .base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport +from google.cloud.discoveryengine_v1alpha.types import evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EvaluationServiceTransport, DEFAULT_CLIENT_INFO from .grpc import EvaluationServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py index ac044da80ed0..bbc8de558959 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest.py @@ -13,27 +13,35 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1alpha.types import evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEvaluationServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -709,9 +717,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() request, metadata = self._interceptor.pre_create_evaluation( request, metadata @@ -865,9 +871,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_evaluation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_transcoded_request( @@ -1015,9 +1019,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() request, metadata = self._interceptor.pre_list_evaluation_results( request, metadata @@ -1173,9 +1175,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_evaluations( request, metadata @@ -1363,9 +1363,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1485,9 +1483,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1626,9 +1622,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest_base.py index fb472becc831..9223819bc86c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/evaluation_service/transports/rest_base.py @@ -14,17 +14,20 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import EvaluationServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1alpha.types import evaluation, evaluation_service +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport + +from google.cloud.discoveryengine_v1alpha.types import evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation_service +from google.longrunning import operations_pb2 # type: ignore class _BaseEvaluationServiceRestTransport(EvaluationServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/__init__.py index 6fea6cab0de9..4cfbfc0e118a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import GroundedGenerationServiceAsyncClient from .client import GroundedGenerationServiceClient +from .async_client import GroundedGenerationServiceAsyncClient __all__ = ( "GroundedGenerationServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py index 0612b2bb6a49..0bdcc34bb91c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,32 +29,29 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service +from google.cloud.discoveryengine_v1alpha.types import grounding from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import ( - grounded_generation_service, - grounding, -) - -from .client import GroundedGenerationServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from .transports.base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import GroundedGenerationServiceGrpcAsyncIOTransport +from .client import GroundedGenerationServiceClient try: from google.api_core import client_logging # type: ignore @@ -130,7 +127,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_info.__func__(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) # type: ignore + return GroundedGenerationServiceClient.from_service_account_info.__func__( + GroundedGenerationServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -146,7 +145,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_file.__func__(GroundedGenerationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return GroundedGenerationServiceClient.from_service_account_file.__func__( + GroundedGenerationServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -184,7 +185,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GroundedGenerationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py index 95e72a67404d..c28efce7a27d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,15 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service +from google.cloud.discoveryengine_v1alpha.types import grounding from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import ( - grounded_generation_service, - grounding, -) - -from .transports.base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from .transports.base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import GroundedGenerationServiceGrpcTransport from .transports.grpc_asyncio import GroundedGenerationServiceGrpcAsyncIOTransport from .transports.rest import GroundedGenerationServiceRestTransport @@ -83,9 +79,7 @@ class GroundedGenerationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GroundedGenerationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport @@ -613,11 +607,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GroundedGenerationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GroundedGenerationServiceClient._read_environment_variables() + ) self._client_cert_source = ( GroundedGenerationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -654,8 +646,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GroundedGenerationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py index 0f3052cbd079..bf39f5e977bd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import GroundedGenerationServiceTransport from .grpc import GroundedGenerationServiceGrpcTransport from .grpc_asyncio import GroundedGenerationServiceGrpcAsyncIOTransport -from .rest import ( - GroundedGenerationServiceRestInterceptor, - GroundedGenerationServiceRestTransport, -) +from .rest import GroundedGenerationServiceRestTransport +from .rest import GroundedGenerationServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GroundedGenerationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py index a34b495acd5a..0a4b7d81c99c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -202,7 +203,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py index 641c6645ab89..9502e95feb0a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service - -from .base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py index fbd280c7e258..4c317c539466 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service - -from .base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO from .grpc import GroundedGenerationServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py index a13211031044..4ccdbf2e92eb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGroundedGenerationServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -364,9 +370,7 @@ def __call__( """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() request, metadata = self._interceptor.pre_check_grounding(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_transcoded_request( @@ -532,9 +536,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -657,9 +659,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -800,9 +800,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest_base.py index 696d16bf3494..2d209b388210 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/grounded_generation_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service - -from .base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseGroundedGenerationServiceRestTransport(GroundedGenerationServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/__init__.py index 92a56900c029..f42a6de5f23b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ProjectServiceAsyncClient from .client import ProjectServiceClient +from .async_client import ProjectServiceAsyncClient __all__ = ( "ProjectServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py index 2a7ea2e10abc..d15d01c70d5b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,17 +47,15 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.types import project from google.cloud.discoveryengine_v1alpha.types import project as gcd_project from google.cloud.discoveryengine_v1alpha.types import project_service - -from .client import ProjectServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ProjectServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ProjectServiceGrpcAsyncIOTransport +from .client import ProjectServiceClient try: from google.api_core import client_logging # type: ignore @@ -122,7 +121,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_info.__func__(ProjectServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ProjectServiceClient.from_service_account_info.__func__( + ProjectServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -138,7 +139,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_file.__func__(ProjectServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ProjectServiceClient.from_service_account_file.__func__( + ProjectServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -570,8 +573,8 @@ async def report_consent_change( Terms available for update: - - `Terms for data - use `__ + - `Terms for data + use `__ .. code-block:: python @@ -627,11 +630,11 @@ async def sample_report_consent_change(): Required. The unique identifier of the terms of service to update. Available term ids: - - ``GA_DATA_USE_TERMS``: `Terms for data - use `__. - When using this service term id, the acceptable - [service_term_version][google.cloud.discoveryengine.v1alpha.ReportConsentChangeRequest.service_term_version] - to provide is ``2022-11-23``. + - ``GA_DATA_USE_TERMS``: `Terms for data + use `__. + When using this service term id, the acceptable + [service_term_version][google.cloud.discoveryengine.v1alpha.ReportConsentChangeRequest.service_term_version] + to provide is ``2022-11-23``. This corresponds to the ``service_term_id`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py index 78f02e76e4ff..19ff6819b5ed 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,15 +63,13 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.types import project from google.cloud.discoveryengine_v1alpha.types import project as gcd_project from google.cloud.discoveryengine_v1alpha.types import project_service - -from .transports.base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ProjectServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ProjectServiceGrpcTransport from .transports.grpc_asyncio import ProjectServiceGrpcAsyncIOTransport from .transports.rest import ProjectServiceRestTransport @@ -85,9 +83,7 @@ class ProjectServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProjectServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] _transport_registry["grpc"] = ProjectServiceGrpcTransport _transport_registry["grpc_asyncio"] = ProjectServiceGrpcAsyncIOTransport _transport_registry["rest"] = ProjectServiceRestTransport @@ -604,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectServiceClient._read_environment_variables() + ) self._client_cert_source = ProjectServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -643,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectServiceTransport, transport) self._api_endpoint = self._transport.host @@ -980,8 +973,8 @@ def report_consent_change( Terms available for update: - - `Terms for data - use `__ + - `Terms for data + use `__ .. code-block:: python @@ -1037,11 +1030,11 @@ def sample_report_consent_change(): Required. The unique identifier of the terms of service to update. Available term ids: - - ``GA_DATA_USE_TERMS``: `Terms for data - use `__. - When using this service term id, the acceptable - [service_term_version][google.cloud.discoveryengine.v1alpha.ReportConsentChangeRequest.service_term_version] - to provide is ``2022-11-23``. + - ``GA_DATA_USE_TERMS``: `Terms for data + use `__. + When using this service term id, the acceptable + [service_term_version][google.cloud.discoveryengine.v1alpha.ReportConsentChangeRequest.service_term_version] + to provide is ``2022-11-23``. This corresponds to the ``service_term_id`` field on the ``request`` instance; if ``request`` is provided, this diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/__init__.py index 34168b4c507d..37999d2dc481 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import ProjectServiceTransport from .grpc import ProjectServiceGrpcTransport from .grpc_asyncio import ProjectServiceGrpcAsyncIOTransport -from .rest import ProjectServiceRestInterceptor, ProjectServiceRestTransport +from .rest import ProjectServiceRestTransport +from .rest import ProjectServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py index 16e21b126b76..a4924d2b1145 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/base.py @@ -16,21 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import project from google.cloud.discoveryengine_v1alpha.types import project as gcd_project from google.cloud.discoveryengine_v1alpha.types import project_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -234,7 +236,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py index 08f815e86000..9d3356be6b61 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import project from google.cloud.discoveryengine_v1alpha.types import project as gcd_project from google.cloud.discoveryengine_v1alpha.types import project_service - -from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ProjectServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -415,8 +417,8 @@ def report_consent_change( Terms available for update: - - `Terms for data - use `__ + - `Terms for data + use `__ Returns: Callable[[~.ReportConsentChangeRequest], diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py index 4589504386c2..3651848c78c7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/grpc_asyncio.py @@ -15,29 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1alpha.types import project from google.cloud.discoveryengine_v1alpha.types import project as gcd_project from google.cloud.discoveryengine_v1alpha.types import project_service - -from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ProjectServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ProjectServiceGrpcTransport try: @@ -427,8 +429,8 @@ def report_consent_change( Terms available for update: - - `Terms for data - use `__ + - `Terms for data + use `__ Returns: Callable[[~.ReportConsentChangeRequest], diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py index 238189fe25fe..1a6c5336e194 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest.py @@ -13,29 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1alpha.types import project from google.cloud.discoveryengine_v1alpha.types import project as gcd_project from google.cloud.discoveryengine_v1alpha.types import project_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseProjectServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -794,9 +801,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() request, metadata = self._interceptor.pre_provision_project( request, metadata @@ -948,9 +953,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseReportConsentChange._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseReportConsentChange._get_http_options() request, metadata = self._interceptor.pre_report_consent_change( request, metadata @@ -1124,9 +1127,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py index adc8d22d3e57..31538289e17f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/project_service/transports/rest_base.py @@ -14,19 +14,21 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ProjectServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import project from google.cloud.discoveryengine_v1alpha.types import project as gcd_project from google.cloud.discoveryengine_v1alpha.types import project_service - -from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseProjectServiceRestTransport(ProjectServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/__init__.py index b87f3b8d87d4..cff8ae0bd628 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import RankServiceAsyncClient from .client import RankServiceClient +from .async_client import RankServiceAsyncClient __all__ = ( "RankServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py index 477f0ce1aec9..dea865989f73 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,29 +29,28 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1alpha.types import rank_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import rank_service - -from .client import RankServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, RankServiceTransport +from .transports.base import RankServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import RankServiceGrpcAsyncIOTransport +from .client import RankServiceClient try: from google.api_core import client_logging # type: ignore @@ -113,7 +112,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_info.__func__(RankServiceAsyncClient, info, *args, **kwargs) # type: ignore + return RankServiceClient.from_service_account_info.__func__( + RankServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_file.__func__(RankServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return RankServiceClient.from_service_account_file.__func__( + RankServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py index 9e1b8a48fd14..297c1e4c187f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,12 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1alpha.types import rank_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import rank_service - -from .transports.base import DEFAULT_CLIENT_INFO, RankServiceTransport +from .transports.base import RankServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import RankServiceGrpcTransport from .transports.grpc_asyncio import RankServiceGrpcAsyncIOTransport from .transports.rest import RankServiceRestTransport @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RankServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RankServiceClient._read_environment_variables() + ) self._client_cert_source = RankServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RankServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/__init__.py index f45de8a44763..3ea75b53c7b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import RankServiceTransport from .grpc import RankServiceGrpcTransport from .grpc_asyncio import RankServiceGrpcAsyncIOTransport -from .rest import RankServiceRestInterceptor, RankServiceRestTransport +from .rest import RankServiceRestTransport +from .rest import RankServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[RankServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py index 3a5cb693529a..5fac287c6cdb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import rank_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -199,7 +200,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py index 3473ec70e031..96520544e7e4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import rank_service - -from .base import DEFAULT_CLIENT_INFO, RankServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RankServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py index 74f232c7fe0b..d7656e85b8d1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1alpha.types import rank_service - -from .base import DEFAULT_CLIENT_INFO, RankServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RankServiceTransport, DEFAULT_CLIENT_INFO from .grpc import RankServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py index 5addf747c92e..cca33cd9b704 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1alpha.types import rank_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseRankServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest_base.py index 4dce9bc7ee70..4bf9dafa80c1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/rank_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import RankServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import rank_service - -from .base import DEFAULT_CLIENT_INFO, RankServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseRankServiceRestTransport(RankServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/__init__.py index 6a625342219a..4ddd61f41d3e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import RecommendationServiceAsyncClient from .client import RecommendationServiceClient +from .async_client import RecommendationServiceAsyncClient __all__ = ( "RecommendationServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py index f8aaf7121b36..1fa032ee8d49 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,29 +29,28 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1alpha.types import recommendation_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import recommendation_service - -from .client import RecommendationServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from .transports.base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import RecommendationServiceGrpcAsyncIOTransport +from .client import RecommendationServiceClient try: from google.api_core import client_logging # type: ignore @@ -127,7 +126,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_info.__func__(RecommendationServiceAsyncClient, info, *args, **kwargs) # type: ignore + return RecommendationServiceClient.from_service_account_info.__func__( + RecommendationServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_file.__func__(RecommendationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return RecommendationServiceClient.from_service_account_file.__func__( + RecommendationServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -181,7 +184,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RecommendationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RecommendationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RecommendationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py index de0fe5621d37..f9cf1985a796 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,12 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1alpha.types import recommendation_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import recommendation_service - -from .transports.base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from .transports.base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import RecommendationServiceGrpcTransport from .transports.grpc_asyncio import RecommendationServiceGrpcAsyncIOTransport from .transports.rest import RecommendationServiceRestTransport @@ -80,9 +78,7 @@ class RecommendationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RecommendationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport @@ -684,11 +680,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RecommendationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RecommendationServiceClient._read_environment_variables() + ) self._client_cert_source = RecommendationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -723,8 +717,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RecommendationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py index f21f53c111bf..a7477e51c44b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import RecommendationServiceTransport from .grpc import RecommendationServiceGrpcTransport from .grpc_asyncio import RecommendationServiceGrpcAsyncIOTransport -from .rest import ( - RecommendationServiceRestInterceptor, - RecommendationServiceRestTransport, -) +from .rest import RecommendationServiceRestTransport +from .rest import RecommendationServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RecommendationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py index 669c9ae115a6..d0f113d95a81 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import recommendation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -202,7 +203,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py index 422bf5d8587f..abd77dabcb21 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import recommendation_service - -from .base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py index c653d05e7799..ae6d55bfdc44 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1alpha.types import recommendation_service - -from .base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO from .grpc import RecommendationServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py index 186cb85db951..7c1897b69931 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1alpha.types import recommendation_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseRecommendationServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -358,9 +364,7 @@ def __call__( """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() request, metadata = self._interceptor.pre_recommend(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseRecommend._get_transcoded_request( @@ -522,9 +526,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -647,9 +649,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -788,9 +788,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest_base.py index e63756fd23a9..d5fdb4dfa538 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/recommendation_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import recommendation_service - -from .base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseRecommendationServiceRestTransport(RecommendationServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/__init__.py index 4cd0b5a2b9ae..db5a8d68d5b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SampleQueryServiceAsyncClient from .client import SampleQueryServiceClient +from .async_client import SampleQueryServiceAsyncClient __all__ = ( "SampleQueryServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py index ccc37228b156..598f0dd5bb3e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,20 +47,18 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.sample_query_service import pagers -from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import import_config from google.cloud.discoveryengine_v1alpha.types import sample_query +from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import sample_query_service - -from .client import SampleQueryServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SampleQueryServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SampleQueryServiceGrpcAsyncIOTransport +from .client import SampleQueryServiceClient try: from google.api_core import client_logging # type: ignore @@ -131,7 +130,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_info.__func__(SampleQueryServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SampleQueryServiceClient.from_service_account_info.__func__( + SampleQueryServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_file.__func__(SampleQueryServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SampleQueryServiceClient.from_service_account_file.__func__( + SampleQueryServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -185,7 +188,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQueryServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py index f9ae93d09530..35461fe3b3e8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,18 +63,16 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.sample_query_service import pagers -from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import import_config from google.cloud.discoveryengine_v1alpha.types import sample_query +from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import sample_query_service - -from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SampleQueryServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SampleQueryServiceGrpcTransport from .transports.grpc_asyncio import SampleQueryServiceGrpcAsyncIOTransport from .transports.rest import SampleQueryServiceRestTransport @@ -88,9 +86,7 @@ class SampleQueryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQueryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport @@ -642,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQueryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQueryServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQueryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -681,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQueryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py index 71fe2d9f2ec8..3d0a9d9fc030 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,10 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - sample_query, - sample_query_service, -) +from google.cloud.discoveryengine_v1alpha.types import sample_query +from google.cloud.discoveryengine_v1alpha.types import sample_query_service class ListSampleQueriesPager: @@ -70,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py index 0f5acb01b776..021eee918899 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/__init__.py @@ -19,12 +19,12 @@ from .base import SampleQueryServiceTransport from .grpc import SampleQueryServiceGrpcTransport from .grpc_asyncio import SampleQueryServiceGrpcAsyncIOTransport -from .rest import SampleQueryServiceRestInterceptor, SampleQueryServiceRestTransport +from .rest import SampleQueryServiceRestTransport +from .rest import SampleQueryServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQueryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py index 4377fb6335eb..3a3155e74205 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/base.py @@ -16,23 +16,25 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import import_config from google.cloud.discoveryengine_v1alpha.types import sample_query +from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import sample_query_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -281,7 +283,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py index 202aedb811be..94028e74d136 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc.py @@ -16,27 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import import_config from google.cloud.discoveryengine_v1alpha.types import sample_query +from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import sample_query_service - -from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SampleQueryServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py index 2f3997e05593..4209bd69a5d9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/grpc_asyncio.py @@ -15,31 +15,33 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import import_config from google.cloud.discoveryengine_v1alpha.types import sample_query +from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import sample_query_service - -from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SampleQueryServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SampleQueryServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py index 3a42f477f338..f27e9e8ac366 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest.py @@ -13,31 +13,38 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + -from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import import_config from google.cloud.discoveryengine_v1alpha.types import sample_query +from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import sample_query_service +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQueryServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -786,9 +793,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_create_sample_query( request, metadata @@ -936,9 +941,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query( request, metadata @@ -1053,9 +1056,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() request, metadata = self._interceptor.pre_get_sample_query( request, metadata @@ -1206,9 +1207,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() request, metadata = self._interceptor.pre_import_sample_queries( request, metadata @@ -1363,9 +1362,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() request, metadata = self._interceptor.pre_list_sample_queries( request, metadata @@ -1517,9 +1514,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_update_sample_query( request, metadata @@ -1727,9 +1722,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1850,9 +1843,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1991,9 +1982,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py index 4728c94f0768..80a98a26bcd6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_service/transports/rest_base.py @@ -14,21 +14,23 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SampleQueryServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format -from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import import_config from google.cloud.discoveryengine_v1alpha.types import sample_query +from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import sample_query_service - -from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseSampleQueryServiceRestTransport(SampleQueryServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/__init__.py index 60ef15e648d4..1df99a2b1309 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SampleQuerySetServiceAsyncClient from .client import SampleQuerySetServiceClient +from .async_client import SampleQuerySetServiceAsyncClient __all__ = ( "SampleQuerySetServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py index 77b87387dd9d..b81807923aa5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,38 +29,37 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( pagers, ) +from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service - -from .client import SampleQuerySetServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SampleQuerySetServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SampleQuerySetServiceGrpcAsyncIOTransport +from .client import SampleQuerySetServiceClient try: from google.api_core import client_logging # type: ignore @@ -134,7 +133,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_info.__func__(SampleQuerySetServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SampleQuerySetServiceClient.from_service_account_info.__func__( + SampleQuerySetServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -150,7 +151,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_file.__func__(SampleQuerySetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SampleQuerySetServiceClient.from_service_account_file.__func__( + SampleQuerySetServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -188,7 +191,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQuerySetServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py index d56b3518b181..c954972c8113 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,21 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( pagers, ) +from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service - -from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SampleQuerySetServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SampleQuerySetServiceGrpcTransport from .transports.grpc_asyncio import SampleQuerySetServiceGrpcAsyncIOTransport from .transports.rest import SampleQuerySetServiceRestTransport @@ -89,9 +87,7 @@ class SampleQuerySetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQuerySetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport @@ -638,11 +634,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQuerySetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQuerySetServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQuerySetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -677,8 +671,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQuerySetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py index 5c20e99b761d..26a20c208fb5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,10 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - sample_query_set, - sample_query_set_service, -) +from google.cloud.discoveryengine_v1alpha.types import sample_query_set +from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service class ListSampleQuerySetsPager: @@ -70,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py index 44ad1aa56225..720035d6d52d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import SampleQuerySetServiceTransport from .grpc import SampleQuerySetServiceGrpcTransport from .grpc_asyncio import SampleQuerySetServiceGrpcAsyncIOTransport -from .rest import ( - SampleQuerySetServiceRestInterceptor, - SampleQuerySetServiceRestTransport, -) +from .rest import SampleQuerySetServiceRestTransport +from .rest import SampleQuerySetServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQuerySetServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py index 7c4b91572279..b5fb1bcfb27b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/base.py @@ -16,24 +16,25 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -271,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py index e7e5954eaba8..3fbac424121a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc.py @@ -16,28 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service - -from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SampleQuerySetServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py index 77cfd63d9821..ddc195419438 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/grpc_asyncio.py @@ -15,32 +15,33 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore +from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service - -from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SampleQuerySetServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SampleQuerySetServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py index 66b4dee48653..0164b8a76478 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest.py @@ -13,32 +13,38 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQuerySetServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -565,9 +571,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_create_sample_query_set( request, metadata @@ -719,9 +723,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query_set( request, metadata @@ -840,9 +842,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_get_sample_query_set( request, metadata @@ -994,9 +994,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() request, metadata = self._interceptor.pre_list_sample_query_sets( request, metadata @@ -1154,9 +1152,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_update_sample_query_set( request, metadata @@ -1365,9 +1361,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1490,9 +1484,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1631,9 +1623,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py index 76658c3d1e60..ee0955a229d2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/sample_query_set_service/transports/rest_base.py @@ -14,22 +14,24 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SampleQuerySetServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format +from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service - -from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseSampleQuerySetServiceRestTransport(SampleQuerySetServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/__init__.py index f95513aefa30..0908014e8c82 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SchemaServiceAsyncClient from .client import SchemaServiceClient +from .async_client import SchemaServiceAsyncClient __all__ = ( "SchemaServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py index e23c5e46c72b..322766424820 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,19 +47,17 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.schema_service import pagers from google.cloud.discoveryengine_v1alpha.types import schema from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema from google.cloud.discoveryengine_v1alpha.types import schema_service - -from .client import SchemaServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from .transports.base import SchemaServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SchemaServiceGrpcAsyncIOTransport +from .client import SchemaServiceClient try: from google.api_core import client_logging # type: ignore @@ -126,7 +125,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_info.__func__(SchemaServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SchemaServiceClient.from_service_account_info.__func__( + SchemaServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_file.__func__(SchemaServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SchemaServiceClient.from_service_account_file.__func__( + SchemaServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py index fbe2e565e9d2..2aa5ef9be472 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,17 +63,15 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.schema_service import pagers from google.cloud.discoveryengine_v1alpha.types import schema from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema from google.cloud.discoveryengine_v1alpha.types import schema_service - -from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from .transports.base import SchemaServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SchemaServiceGrpcTransport from .transports.grpc_asyncio import SchemaServiceGrpcAsyncIOTransport from .transports.rest import SchemaServiceRestTransport @@ -635,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SchemaServiceClient._read_environment_variables() + ) self._client_cert_source = SchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py index f5efd716d3d5..6f83234dfc96 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import schema, schema_service +from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema_service class ListSchemasPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/__init__.py index d21d5baa6100..78c2fa21d683 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import SchemaServiceTransport from .grpc import SchemaServiceGrpcTransport from .grpc_asyncio import SchemaServiceGrpcAsyncIOTransport -from .rest import SchemaServiceRestInterceptor, SchemaServiceRestTransport +from .rest import SchemaServiceRestTransport +from .rest import SchemaServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[SchemaServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py index c895288d24e9..842776c0eced 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/base.py @@ -16,19 +16,22 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import schema, schema_service +from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -263,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py index 4e7f33fbe9ff..1c5db99b2956 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc.py @@ -16,23 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import schema, schema_service - -from .base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py index 2e7b5673ea53..dca2bbbe4a55 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/grpc_asyncio.py @@ -15,27 +15,30 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1alpha.types import schema, schema_service - -from .base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SchemaServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py index 7eade9324da8..03b96c8e0167 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest.py @@ -13,27 +13,35 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import schema, schema_service -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSchemaServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest_base.py index 1acf5d9dabd7..017c6dba4082 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/schema_service/transports/rest_base.py @@ -14,17 +14,20 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1alpha.types import schema, schema_service +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, SchemaServiceTransport + +from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.discoveryengine_v1alpha.types import schema_service +from google.longrunning import operations_pb2 # type: ignore class _BaseSchemaServiceRestTransport(SchemaServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/__init__.py index 96aaa3993300..2be7ab3ff9b0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SearchServiceAsyncClient from .client import SearchServiceClient +from .async_client import SearchServiceAsyncClient __all__ = ( "SearchServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py index f18a4ef0ba91..7141b74963bf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,30 +29,29 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.search_service import pagers from google.cloud.discoveryengine_v1alpha.types import search_service - -from .client import SearchServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .transports.base import SearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SearchServiceGrpcAsyncIOTransport +from .client import SearchServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +127,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_info.__func__(SearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SearchServiceClient.from_service_account_info.__func__( + SearchServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_file.__func__(SearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SearchServiceClient.from_service_account_file.__func__( + SearchServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py index 5b2d542332b5..911106608e8b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,13 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.search_service import pagers from google.cloud.discoveryengine_v1alpha.types import search_service - -from .transports.base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .transports.base import SearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SearchServiceGrpcTransport from .transports.grpc_asyncio import SearchServiceGrpcAsyncIOTransport from .transports.rest import SearchServiceRestTransport @@ -729,11 +727,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchServiceClient._read_environment_variables() + ) self._client_cert_source = SearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -768,8 +764,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py index 58b027b8b742..b1eaba691652 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -67,7 +66,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +142,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/__init__.py index 24f3c65a62e4..62c175446415 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import SearchServiceTransport from .grpc import SearchServiceGrpcTransport from .grpc_asyncio import SearchServiceGrpcAsyncIOTransport -from .rest import SearchServiceRestInterceptor, SearchServiceRestTransport +from .rest import SearchServiceRestTransport +from .rest import SearchServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[SearchServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py index c10ee30846ef..5faa2f63ee35 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import search_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -199,7 +200,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py index 9030580c8efb..bb3813308662 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_service - -from .base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py index 555da5238e97..fa9afafc6fdf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_service - -from .base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SearchServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py index d4feaa473f18..097679fc21ef 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1alpha.types import search_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSearchServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest_base.py index 713774f0c20a..3a2f7f8d381b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SearchServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import search_service - -from .base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseSearchServiceRestTransport(SearchServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/__init__.py index 1759c51ec4ab..6b603bf03c01 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SearchTuningServiceAsyncClient from .client import SearchTuningServiceClient +from .async_client import SearchTuningServiceAsyncClient __all__ = ( "SearchTuningServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py index e689cffa1d7c..6cdf6ea86029 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,17 +47,13 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.types import custom_tuning_model +from google.cloud.discoveryengine_v1alpha.types import search_tuning_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import ( - custom_tuning_model, - search_tuning_service, -) - -from .client import SearchTuningServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from .transports.base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SearchTuningServiceGrpcAsyncIOTransport +from .client import SearchTuningServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +125,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_info.__func__(SearchTuningServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SearchTuningServiceClient.from_service_account_info.__func__( + SearchTuningServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +143,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_file.__func__(SearchTuningServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SearchTuningServiceClient.from_service_account_file.__func__( + SearchTuningServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -182,7 +183,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SearchTuningServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py index 044ba7b00135..d8b6b21303ec 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,15 +63,11 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.types import custom_tuning_model +from google.cloud.discoveryengine_v1alpha.types import search_tuning_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import ( - custom_tuning_model, - search_tuning_service, -) - -from .transports.base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from .transports.base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SearchTuningServiceGrpcTransport from .transports.grpc_asyncio import SearchTuningServiceGrpcAsyncIOTransport from .transports.rest import SearchTuningServiceRestTransport @@ -85,9 +81,7 @@ class SearchTuningServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SearchTuningServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport @@ -637,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchTuningServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchTuningServiceClient._read_environment_variables() + ) self._client_cert_source = SearchTuningServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -676,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchTuningServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py index d759f5c3cdcd..a1d0aa1f0e9f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/__init__.py @@ -19,12 +19,12 @@ from .base import SearchTuningServiceTransport from .grpc import SearchTuningServiceGrpcTransport from .grpc_asyncio import SearchTuningServiceGrpcAsyncIOTransport -from .rest import SearchTuningServiceRestInterceptor, SearchTuningServiceRestTransport +from .rest import SearchTuningServiceRestTransport +from .rest import SearchTuningServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SearchTuningServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py index b4d2acd32a88..959eb30449d3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/base.py @@ -16,19 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import search_tuning_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -221,7 +223,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py index d44cf1faaece..445c8c506df6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_tuning_service - -from .base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py index f8a5cb229b0f..1afc2866ee16 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/grpc_asyncio.py @@ -15,27 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_tuning_service - -from .base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SearchTuningServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py index c90fd763bfb7..b84618cd20b6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest.py @@ -13,27 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1alpha.types import search_tuning_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSearchTuningServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -591,9 +598,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() request, metadata = self._interceptor.pre_list_custom_models( request, metadata @@ -746,9 +751,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() request, metadata = self._interceptor.pre_train_custom_model( request, metadata @@ -918,9 +921,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1041,9 +1042,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1182,9 +1181,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest_base.py index f8fbe32a984e..bf376219b05e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/search_tuning_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import search_tuning_service - -from .base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseSearchTuningServiceRestTransport(SearchTuningServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/__init__.py index 5e424baa78b8..123f6508d9a5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ServingConfigServiceAsyncClient from .client import ServingConfigServiceClient +from .async_client import ServingConfigServiceAsyncClient __all__ = ( "ServingConfigServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py index 1447f23f774d..f3e9e8fbe29a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,37 +29,36 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import serving_config_service - -from .client import ServingConfigServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ServingConfigServiceGrpcAsyncIOTransport +from .client import ServingConfigServiceClient try: from google.api_core import client_logging # type: ignore @@ -127,7 +126,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_info.__func__(ServingConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ServingConfigServiceClient.from_service_account_info.__func__( + ServingConfigServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_file.__func__(ServingConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ServingConfigServiceClient.from_service_account_file.__func__( + ServingConfigServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -181,7 +184,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ServingConfigServiceTransport: @@ -368,7 +373,7 @@ async def sample_update_serving_config(): [ServingConfig][google.cloud.discoveryengine.v1alpha.ServingConfig] to update. The following are NOT supported: - - [ServingConfig.name][google.cloud.discoveryengine.v1alpha.ServingConfig.name] + - [ServingConfig.name][google.cloud.discoveryengine.v1alpha.ServingConfig.name] If not set, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py index ddb04006b88c..8b36c75a3df8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,20 +61,18 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import serving_config_service - -from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ServingConfigServiceGrpcTransport from .transports.grpc_asyncio import ServingConfigServiceGrpcAsyncIOTransport from .transports.rest import ServingConfigServiceRestTransport @@ -88,9 +86,7 @@ class ServingConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServingConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport @@ -620,11 +616,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServingConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServingConfigServiceClient._read_environment_variables() + ) self._client_cert_source = ServingConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +653,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServingConfigServiceTransport, transport) self._api_endpoint = self._transport.host @@ -792,7 +785,7 @@ def sample_update_serving_config(): [ServingConfig][google.cloud.discoveryengine.v1alpha.ServingConfig] to update. The following are NOT supported: - - [ServingConfig.name][google.cloud.discoveryengine.v1alpha.ServingConfig.name] + - [ServingConfig.name][google.cloud.discoveryengine.v1alpha.ServingConfig.name] If not set, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py index 24a16678965c..779becc9b0be 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,10 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - serving_config, - serving_config_service, -) +from google.cloud.discoveryengine_v1alpha.types import serving_config +from google.cloud.discoveryengine_v1alpha.types import serving_config_service class ListServingConfigsPager: @@ -70,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py index 6bdd4697d637..21e7b3091b0a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/__init__.py @@ -19,12 +19,12 @@ from .base import ServingConfigServiceTransport from .grpc import ServingConfigServiceGrpcTransport from .grpc_asyncio import ServingConfigServiceGrpcAsyncIOTransport -from .rest import ServingConfigServiceRestInterceptor, ServingConfigServiceRestTransport +from .rest import ServingConfigServiceRestTransport +from .rest import ServingConfigServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServingConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py index 29664d1552ba..ccf58fb525a3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/base.py @@ -16,23 +16,24 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version +from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import serving_config_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -237,7 +238,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py index a05f1bdc3f4f..f85c428919fd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc.py @@ -16,27 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import serving_config_service - -from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py index 3f137c837306..47f507ff9264 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/grpc_asyncio.py @@ -15,31 +15,32 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore +from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import serving_config_service - -from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ServingConfigServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py index e475ede325f4..610847caa6c3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest.py @@ -13,31 +13,37 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import serving_config_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseServingConfigServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -483,9 +489,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() request, metadata = self._interceptor.pre_get_serving_config( request, metadata @@ -635,9 +639,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() request, metadata = self._interceptor.pre_list_serving_configs( request, metadata @@ -796,9 +798,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() request, metadata = self._interceptor.pre_update_serving_config( request, metadata @@ -985,9 +985,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1108,9 +1106,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1249,9 +1245,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py index 1f589b60cac7..10a916c22bb7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/serving_config_service/transports/rest_base.py @@ -14,21 +14,23 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format +from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import serving_config_service - -from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseServingConfigServiceRestTransport(ServingConfigServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/__init__.py index c278fb1603a2..a00026df42c5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SessionServiceAsyncClient from .client import SessionServiceClient +from .async_client import SessionServiceAsyncClient __all__ = ( "SessionServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py index 214877f6d77a..a3a7a700f78c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,35 +29,34 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.session_service import pagers from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from google.cloud.discoveryengine_v1alpha.types import session_service - -from .client import SessionServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SessionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SessionServiceGrpcAsyncIOTransport +from .client import SessionServiceClient try: from google.api_core import client_logging # type: ignore @@ -129,7 +128,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_info.__func__(SessionServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SessionServiceClient.from_service_account_info.__func__( + SessionServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +146,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_file.__func__(SessionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SessionServiceClient.from_service_account_file.__func__( + SessionServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -586,7 +589,7 @@ async def sample_update_session(): [Session][google.cloud.discoveryengine.v1alpha.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1alpha.Session.name] + - [Session.name][google.cloud.discoveryengine.v1alpha.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py index d2c4668b4dac..dfee99973b25 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,18 +61,16 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.session_service import pagers from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from google.cloud.discoveryengine_v1alpha.types import session_service - -from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SessionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SessionServiceGrpcTransport from .transports.grpc_asyncio import SessionServiceGrpcAsyncIOTransport from .transports.rest import SessionServiceRestTransport @@ -86,9 +84,7 @@ class SessionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] _transport_registry["grpc"] = SessionServiceGrpcTransport _transport_registry["grpc_asyncio"] = SessionServiceGrpcAsyncIOTransport _transport_registry["rest"] = SessionServiceRestTransport @@ -714,11 +710,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionServiceClient._read_environment_variables() + ) self._client_cert_source = SessionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -753,8 +747,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1099,7 +1092,7 @@ def sample_update_session(): [Session][google.cloud.discoveryengine.v1alpha.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1alpha.Session.name] + - [Session.name][google.cloud.discoveryengine.v1alpha.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py index d78399681d46..6b333ed59fe0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,11 +37,9 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - conversational_search_service, - session, - session_service, -) +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service +from google.cloud.discoveryengine_v1alpha.types import session +from google.cloud.discoveryengine_v1alpha.types import session_service class ListSessionsPager: @@ -71,7 +68,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -149,7 +146,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -231,7 +228,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -307,7 +304,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/__init__.py index d258a984225b..541203cdd07f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import SessionServiceTransport from .grpc import SessionServiceGrpcTransport from .grpc_asyncio import SessionServiceGrpcAsyncIOTransport -from .rest import SessionServiceRestInterceptor, SessionServiceRestTransport +from .rest import SessionServiceRestTransport +from .rest import SessionServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py index 7e8ee45fd992..e7d85f79b027 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/base.py @@ -16,23 +16,24 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from google.cloud.discoveryengine_v1alpha.types import session_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -279,7 +280,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py index b337438a531f..8f30f6c3f0d2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc.py @@ -16,18 +16,17 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore @@ -35,8 +34,10 @@ from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from google.cloud.discoveryengine_v1alpha.types import session_service - -from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SessionServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py index 2674071048ef..bb819bb2bc05 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/grpc_asyncio.py @@ -15,31 +15,32 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from google.cloud.discoveryengine_v1alpha.types import session_service - -from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SessionServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SessionServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py index bfc68a801c15..df79f4e8c229 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest.py @@ -13,31 +13,37 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from google.cloud.discoveryengine_v1alpha.types import session_service +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -1516,9 +1522,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py index 562d5a8f17a5..3ad366c002c1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/session_service/transports/rest_base.py @@ -14,21 +14,23 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SessionServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from google.cloud.discoveryengine_v1alpha.types import session_service - -from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseSessionServiceRestTransport(SessionServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/__init__.py index 8039b8753159..3bffbf62365f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SiteSearchEngineServiceAsyncClient from .client import SiteSearchEngineServiceClient +from .async_client import SiteSearchEngineServiceAsyncClient __all__ = ( "SiteSearchEngineServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py index e7afd8396e21..44b627cd6239 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,22 +47,18 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( + pagers, +) +from google.cloud.discoveryengine_v1alpha.types import site_search_engine +from google.cloud.discoveryengine_v1alpha.types import site_search_engine_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( - pagers, -) -from google.cloud.discoveryengine_v1alpha.types import ( - site_search_engine, - site_search_engine_service, -) - -from .client import SiteSearchEngineServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from .transports.base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SiteSearchEngineServiceGrpcAsyncIOTransport +from .client import SiteSearchEngineServiceClient try: from google.api_core import client_logging # type: ignore @@ -139,7 +136,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_info.__func__(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SiteSearchEngineServiceClient.from_service_account_info.__func__( + SiteSearchEngineServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -155,7 +154,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_file.__func__(SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SiteSearchEngineServiceClient.from_service_account_file.__func__( + SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -193,7 +194,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SiteSearchEngineServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py index 9452cdc64216..bd1e6305230a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,20 +63,16 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( + pagers, +) +from google.cloud.discoveryengine_v1alpha.types import site_search_engine +from google.cloud.discoveryengine_v1alpha.types import site_search_engine_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( - pagers, -) -from google.cloud.discoveryengine_v1alpha.types import ( - site_search_engine, - site_search_engine_service, -) - -from .transports.base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from .transports.base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SiteSearchEngineServiceGrpcTransport from .transports.grpc_asyncio import SiteSearchEngineServiceGrpcAsyncIOTransport from .transports.rest import SiteSearchEngineServiceRestTransport @@ -90,9 +86,7 @@ class SiteSearchEngineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport @@ -644,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteSearchEngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteSearchEngineServiceClient._read_environment_variables() + ) self._client_cert_source = ( SiteSearchEngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -685,8 +677,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteSearchEngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py index e27d863f6e4d..c16905a5b372 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,10 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - site_search_engine, - site_search_engine_service, -) +from google.cloud.discoveryengine_v1alpha.types import site_search_engine +from google.cloud.discoveryengine_v1alpha.types import site_search_engine_service class ListTargetSitesPager: @@ -70,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -315,7 +312,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py index 5443c0c10cf1..31f1983d1847 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import SiteSearchEngineServiceTransport from .grpc import SiteSearchEngineServiceGrpcTransport from .grpc_asyncio import SiteSearchEngineServiceGrpcAsyncIOTransport -from .rest import ( - SiteSearchEngineServiceRestInterceptor, - SiteSearchEngineServiceRestTransport, -) +from .rest import SiteSearchEngineServiceRestTransport +from .rest import SiteSearchEngineServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py index 35efbc6c11ad..6014a8f448ec 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/base.py @@ -16,22 +16,22 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import ( - site_search_engine, - site_search_engine_service, -) +from google.cloud.discoveryengine_v1alpha.types import site_search_engine +from google.cloud.discoveryengine_v1alpha.types import site_search_engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -401,7 +401,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py index 8f382f491cae..2f05009e0acc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc.py @@ -16,26 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - site_search_engine, - site_search_engine_service, -) - -from .base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from google.cloud.discoveryengine_v1alpha.types import site_search_engine +from google.cloud.discoveryengine_v1alpha.types import site_search_engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -573,12 +573,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -605,12 +605,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -698,12 +698,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] @@ -730,12 +730,12 @@ def set_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "set_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", - request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", + request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_uri_pattern_document_data"] @@ -762,12 +762,12 @@ def get_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "get_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", - request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, - response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + self._stubs["get_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", + request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, + response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + ) ) return self._stubs["get_uri_pattern_document_data"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py index 2ed1e259fb54..694b22f57db5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/grpc_asyncio.py @@ -15,30 +15,30 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - site_search_engine, - site_search_engine_service, -) - -from .base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from google.cloud.discoveryengine_v1alpha.types import site_search_engine +from google.cloud.discoveryengine_v1alpha.types import site_search_engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SiteSearchEngineServiceGrpcTransport try: @@ -585,12 +585,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -617,12 +617,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -711,12 +711,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] @@ -743,12 +743,12 @@ def set_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "set_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "set_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", - request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["set_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/SetUriPatternDocumentData", + request_serializer=site_search_engine_service.SetUriPatternDocumentDataRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["set_uri_pattern_document_data"] @@ -775,12 +775,12 @@ def get_uri_pattern_document_data( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "get_uri_pattern_document_data" not in self._stubs: - self._stubs[ - "get_uri_pattern_document_data" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", - request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, - response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + self._stubs["get_uri_pattern_document_data"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1alpha.SiteSearchEngineService/GetUriPatternDocumentData", + request_serializer=site_search_engine_service.GetUriPatternDocumentDataRequest.serialize, + response_deserializer=site_search_engine_service.GetUriPatternDocumentDataResponse.deserialize, + ) ) return self._stubs["get_uri_pattern_document_data"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py index 7fc6fb032896..f6836107e464 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest.py @@ -13,30 +13,35 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1alpha.types import site_search_engine +from google.cloud.discoveryengine_v1alpha.types import site_search_engine_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - site_search_engine, - site_search_engine_service, -) -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSiteSearchEngineServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -1287,9 +1292,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_create_target_sites( request, metadata @@ -1443,9 +1446,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_verify_target_sites( request, metadata @@ -1599,9 +1600,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() request, metadata = self._interceptor.pre_create_target_site( request, metadata @@ -1756,9 +1755,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() request, metadata = self._interceptor.pre_delete_target_site( request, metadata @@ -1912,9 +1909,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_disable_advanced_site_search( request, metadata @@ -2069,9 +2064,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_enable_advanced_site_search( request, metadata @@ -2227,9 +2220,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() request, metadata = self._interceptor.pre_fetch_domain_verification_status( request, metadata @@ -2297,11 +2288,10 @@ def __call__( resp = self._interceptor.post_fetch_domain_verification_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_domain_verification_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_domain_verification_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2389,9 +2379,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() request, metadata = self._interceptor.pre_get_site_search_engine( request, metadata @@ -2544,9 +2532,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() request, metadata = self._interceptor.pre_get_target_site(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_transcoded_request( @@ -2699,9 +2685,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetUriPatternDocumentData._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetUriPatternDocumentData._get_http_options() request, metadata = self._interceptor.pre_get_uri_pattern_document_data( request, metadata @@ -2767,11 +2751,10 @@ def __call__( resp = self._interceptor.post_get_uri_pattern_document_data(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_get_uri_pattern_document_data_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_get_uri_pattern_document_data_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2858,9 +2841,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() request, metadata = self._interceptor.pre_list_target_sites( request, metadata @@ -3017,9 +2998,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() request, metadata = self._interceptor.pre_recrawl_uris(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_transcoded_request( @@ -3174,9 +3153,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseSetUriPatternDocumentData._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseSetUriPatternDocumentData._get_http_options() request, metadata = self._interceptor.pre_set_uri_pattern_document_data( request, metadata @@ -3243,11 +3220,10 @@ def __call__( resp = self._interceptor.post_set_uri_pattern_document_data(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_set_uri_pattern_document_data_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_set_uri_pattern_document_data_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -3333,9 +3309,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() request, metadata = self._interceptor.pre_update_target_site( request, metadata @@ -3439,7 +3413,9 @@ def batch_create_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_verify_target_sites( @@ -3450,7 +3426,9 @@ def batch_verify_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchVerifyTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchVerifyTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_target_site( @@ -3481,7 +3459,9 @@ def disable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DisableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._DisableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_advanced_site_search( @@ -3492,7 +3472,9 @@ def enable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EnableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._EnableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_domain_verification_status( @@ -3503,7 +3485,9 @@ def fetch_domain_verification_status( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchDomainVerificationStatus(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDomainVerificationStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def get_site_search_engine( @@ -3535,7 +3519,9 @@ def get_uri_pattern_document_data( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GetUriPatternDocumentData(self._session, self._host, self._interceptor) # type: ignore + return self._GetUriPatternDocumentData( + self._session, self._host, self._interceptor + ) # type: ignore @property def list_target_sites( @@ -3567,7 +3553,9 @@ def set_uri_pattern_document_data( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._SetUriPatternDocumentData(self._session, self._host, self._interceptor) # type: ignore + return self._SetUriPatternDocumentData( + self._session, self._host, self._interceptor + ) # type: ignore @property def update_target_site( @@ -3635,9 +3623,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3760,9 +3746,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3901,9 +3885,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest_base.py index 6c26e6fc8027..562f7768a4d3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/site_search_engine_service/transports/rest_base.py @@ -14,20 +14,20 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1alpha.types import ( - site_search_engine, - site_search_engine_service, -) +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport + +from google.cloud.discoveryengine_v1alpha.types import site_search_engine +from google.cloud.discoveryengine_v1alpha.types import site_search_engine_service +from google.longrunning import operations_pb2 # type: ignore class _BaseSiteSearchEngineServiceRestTransport(SiteSearchEngineServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/__init__.py index eea5da67c013..4c45751a520f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import UserEventServiceAsyncClient from .client import UserEventServiceClient +from .async_client import UserEventServiceAsyncClient __all__ = ( "UserEventServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py index 1bb360f4083c..f83f34e02ea9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -47,22 +48,18 @@ from google.api import httpbody_pb2 # type: ignore from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.discoveryengine_v1alpha.types import user_event +from google.cloud.discoveryengine_v1alpha.types import user_event_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import any_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import ( - common, - import_config, - purge_config, - user_event, - user_event_service, -) - -from .client import UserEventServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from .transports.base import UserEventServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import UserEventServiceGrpcAsyncIOTransport +from .client import UserEventServiceClient try: from google.api_core import client_logging # type: ignore @@ -132,7 +129,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_info.__func__(UserEventServiceAsyncClient, info, *args, **kwargs) # type: ignore + return UserEventServiceClient.from_service_account_info.__func__( + UserEventServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +147,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_file.__func__(UserEventServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return UserEventServiceClient.from_service_account_file.__func__( + UserEventServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py index edd1c68b80a8..4a602bf72755 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -64,20 +64,16 @@ from google.api import httpbody_pb2 # type: ignore from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.discoveryengine_v1alpha.types import user_event +from google.cloud.discoveryengine_v1alpha.types import user_event_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import any_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1alpha.types import ( - common, - import_config, - purge_config, - user_event, - user_event_service, -) - -from .transports.base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from .transports.base import UserEventServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import UserEventServiceGrpcTransport from .transports.grpc_asyncio import UserEventServiceGrpcAsyncIOTransport from .transports.rest import UserEventServiceRestTransport @@ -91,9 +87,7 @@ class UserEventServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserEventServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] _transport_registry["grpc"] = UserEventServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserEventServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserEventServiceRestTransport @@ -669,11 +663,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserEventServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserEventServiceClient._read_environment_variables() + ) self._client_cert_source = UserEventServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -708,8 +700,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserEventServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/__init__.py index 771ec74658ec..d136d6cf3abb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import UserEventServiceTransport from .grpc import UserEventServiceGrpcTransport from .grpc_asyncio import UserEventServiceGrpcAsyncIOTransport -from .rest import UserEventServiceRestInterceptor, UserEventServiceRestTransport +from .rest import UserEventServiceRestTransport +from .rest import UserEventServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py index f098b01fb546..b5e5ad6550a5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/base.py @@ -16,25 +16,25 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1alpha import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1alpha import gapic_version as package_version -from google.cloud.discoveryengine_v1alpha.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.discoveryengine_v1alpha.types import user_event +from google.cloud.discoveryengine_v1alpha.types import user_event_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -261,7 +261,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py index 33e163821218..cc679b604e21 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc.py @@ -16,29 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) - -from .base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.discoveryengine_v1alpha.types import user_event +from google.cloud.discoveryengine_v1alpha.types import user_event_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import UserEventServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py index 5b08bb46fbfb..ba55bf0585ae 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/grpc_asyncio.py @@ -15,33 +15,33 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) - -from .base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.discoveryengine_v1alpha.types import user_event +from google.cloud.discoveryengine_v1alpha.types import user_event_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import UserEventServiceTransport, DEFAULT_CLIENT_INFO from .grpc import UserEventServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py index f23996dff3db..db2400f6d42c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest.py @@ -13,33 +13,38 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.discoveryengine_v1alpha.types import user_event +from google.cloud.discoveryengine_v1alpha.types import user_event_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseUserEventServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -752,9 +757,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() request, metadata = self._interceptor.pre_collect_user_event( request, metadata @@ -904,9 +907,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() request, metadata = self._interceptor.pre_import_user_events( request, metadata @@ -1059,9 +1060,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() request, metadata = self._interceptor.pre_purge_user_events( request, metadata @@ -1214,9 +1213,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() request, metadata = self._interceptor.pre_write_user_event( request, metadata @@ -1399,9 +1396,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1661,9 +1656,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserEventServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest_base.py index 92e31f17d2ab..7c44cf752637 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/services/user_event_service/transports/rest_base.py @@ -14,23 +14,23 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import UserEventServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union + from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.discoveryengine_v1alpha.types import user_event +from google.cloud.discoveryengine_v1alpha.types import user_event_service from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format - -from google.cloud.discoveryengine_v1alpha.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) - -from .base import DEFAULT_CLIENT_INFO, UserEventServiceTransport class _BaseUserEventServiceRestTransport(UserEventServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py index 5d1b94d52bc5..5f6b8ea1a96d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/__init__.py @@ -13,31 +13,53 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .acl_config import AclConfig -from .acl_config_service import GetAclConfigRequest, UpdateAclConfigRequest -from .answer import Answer -from .chunk import Chunk -from .chunk_service import GetChunkRequest, ListChunksRequest, ListChunksResponse +from .acl_config import ( + AclConfig, +) +from .acl_config_service import ( + GetAclConfigRequest, + UpdateAclConfigRequest, +) +from .answer import ( + Answer, +) +from .chunk import ( + Chunk, +) +from .chunk_service import ( + GetChunkRequest, + ListChunksRequest, + ListChunksResponse, +) from .common import ( CustomAttribute, CustomFineTuningSpec, DoubleList, EmbeddingConfig, - FileOriginType, GuidedSearchSpec, IdpConfig, - IndustryVertical, Interval, Principal, + UserInfo, + FileOriginType, + IndustryVertical, SearchAddOn, SearchTier, SearchUseCase, SolutionType, - UserInfo, ) -from .completion import CompletionSuggestion, SuggestionDenyListEntry -from .completion_service import CompleteQueryRequest, CompleteQueryResponse -from .control import Condition, Control +from .completion import ( + CompletionSuggestion, + SuggestionDenyListEntry, +) +from .completion_service import ( + CompleteQueryRequest, + CompleteQueryResponse, +) +from .control import ( + Condition, + Control, +) from .control_service import ( CreateControlRequest, DeleteControlRequest, @@ -72,8 +94,14 @@ UpdateConversationRequest, UpdateSessionRequest, ) -from .custom_tuning_model import CustomTuningModel -from .data_store import DataStore, LanguageInfo, WorkspaceConfig +from .custom_tuning_model import ( + CustomTuningModel, +) +from .data_store import ( + DataStore, + LanguageInfo, + WorkspaceConfig, +) from .data_store_service import ( CreateDataStoreMetadata, CreateDataStoreRequest, @@ -86,8 +114,13 @@ UpdateDataStoreRequest, UpdateDocumentProcessingConfigRequest, ) -from .document import Document, ProcessedDocument -from .document_processing_config import DocumentProcessingConfig +from .document import ( + Document, + ProcessedDocument, +) +from .document_processing_config import ( + DocumentProcessingConfig, +) from .document_service import ( BatchGetDocumentsMetadataRequest, BatchGetDocumentsMetadataResponse, @@ -99,7 +132,9 @@ ListDocumentsResponse, UpdateDocumentRequest, ) -from .engine import Engine +from .engine import ( + Engine, +) from .engine_service import ( CreateEngineMetadata, CreateEngineRequest, @@ -120,7 +155,10 @@ EstimateDataSizeRequest, EstimateDataSizeResponse, ) -from .evaluation import Evaluation, QualityMetrics +from .evaluation import ( + Evaluation, + QualityMetrics, +) from .evaluation_service import ( CreateEvaluationMetadata, CreateEvaluationRequest, @@ -135,7 +173,10 @@ CheckGroundingResponse, CheckGroundingSpec, ) -from .grounding import FactChunk, GroundingFact +from .grounding import ( + FactChunk, + GroundingFact, +) from .import_config import ( AlloyDbSource, BigQuerySource, @@ -163,7 +204,9 @@ ImportUserEventsResponse, SpannerSource, ) -from .project import Project +from .project import ( + Project, +) from .project_service import ( GetProjectRequest, ProvisionProjectMetadata, @@ -185,9 +228,18 @@ PurgeUserEventsRequest, PurgeUserEventsResponse, ) -from .rank_service import RankingRecord, RankRequest, RankResponse -from .recommendation_service import RecommendRequest, RecommendResponse -from .sample_query import SampleQuery +from .rank_service import ( + RankingRecord, + RankRequest, + RankResponse, +) +from .recommendation_service import ( + RecommendRequest, + RecommendResponse, +) +from .sample_query import ( + SampleQuery, +) from .sample_query_service import ( CreateSampleQueryRequest, DeleteSampleQueryRequest, @@ -196,7 +248,9 @@ ListSampleQueriesResponse, UpdateSampleQueryRequest, ) -from .sample_query_set import SampleQuerySet +from .sample_query_set import ( + SampleQuerySet, +) from .sample_query_set_service import ( CreateSampleQuerySetRequest, DeleteSampleQuerySetRequest, @@ -205,7 +259,10 @@ ListSampleQuerySetsResponse, UpdateSampleQuerySetRequest, ) -from .schema import FieldConfig, Schema +from .schema import ( + FieldConfig, + Schema, +) from .schema_service import ( CreateSchemaMetadata, CreateSchemaRequest, @@ -217,7 +274,10 @@ UpdateSchemaMetadata, UpdateSchemaRequest, ) -from .search_service import SearchRequest, SearchResponse +from .search_service import ( + SearchRequest, + SearchResponse, +) from .search_tuning_service import ( ListCustomModelsRequest, ListCustomModelsResponse, @@ -225,7 +285,9 @@ TrainCustomModelRequest, TrainCustomModelResponse, ) -from .serving_config import ServingConfig +from .serving_config import ( + ServingConfig, +) from .serving_config_service import ( GetServingConfigRequest, ListServingConfigsRequest, @@ -235,15 +297,22 @@ from .session import ( FileCharacteristics, FileMetadata, - FileSource, FileView, ImageCharacteristics, Query, Session, VideoCharacteristics, + FileSource, +) +from .session_service import ( + ListFilesRequest, + ListFilesResponse, +) +from .site_search_engine import ( + SiteSearchEngine, + SiteVerificationInfo, + TargetSite, ) -from .session_service import ListFilesRequest, ListFilesResponse -from .site_search_engine import SiteSearchEngine, SiteVerificationInfo, TargetSite from .site_search_engine_service import ( BatchCreateTargetSiteMetadata, BatchCreateTargetSitesRequest, @@ -288,7 +357,10 @@ TransactionInfo, UserEvent, ) -from .user_event_service import CollectUserEventRequest, WriteUserEventRequest +from .user_event_service import ( + CollectUserEventRequest, + WriteUserEventRequest, +) __all__ = ( "AclConfig", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/acl_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/acl_config.py index fb53291781fc..b17c0c5dfb9b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/acl_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/acl_config.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1alpha.types import common + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/acl_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/acl_config_service.py index d3e01127238c..73a947c30384 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/acl_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/acl_config_service.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1alpha.types import acl_config as gcd_acl_config + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py index ae0b7fa763b2..1995d73a8280 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/answer.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore -import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -73,6 +75,7 @@ class State(proto.Enum): SUCCEEDED (3): Answer generation has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -118,6 +121,7 @@ class AnswerSkippedReason(proto.Enum): policy violation detected. The policy is defined by the customer. """ + ANSWER_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_ANSWER_SEEKING_QUERY_IGNORED = 2 @@ -425,6 +429,7 @@ class State(proto.Enum): SUCCEEDED (3): Step has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -649,6 +654,7 @@ class Type(proto.Enum): JAIL_BREAKING_QUERY (3): Jail-breaking query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk.py index b51af63286be..348b18105283 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore +from google.protobuf import struct_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk_service.py index f2945939355f..edf155a472fd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/chunk_service.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1alpha.types import chunk + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py index 9419297699e0..7409c9277ef3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/common.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -56,6 +57,7 @@ class IndustryVertical(proto.Enum): HEALTHCARE_FHIR (7): The healthcare FHIR vertical. """ + INDUSTRY_VERTICAL_UNSPECIFIED = 0 GENERIC = 1 MEDIA = 2 @@ -81,6 +83,7 @@ class SolutionType(proto.Enum): data stores must enrolled with ``SOLUTION_TYPE_CHAT`` solution. """ + SOLUTION_TYPE_UNSPECIFIED = 0 SOLUTION_TYPE_RECOMMENDATION = 1 SOLUTION_TYPE_SEARCH = 2 @@ -103,6 +106,7 @@ class SearchUseCase(proto.Enum): Browse use case. Expects the traffic has an empty [query][google.cloud.discoveryengine.v1alpha.SearchRequest.query]. """ + SEARCH_USE_CASE_UNSPECIFIED = 0 SEARCH_USE_CASE_SEARCH = 1 SEARCH_USE_CASE_BROWSE = 2 @@ -122,6 +126,7 @@ class SearchTier(proto.Enum): SEARCH_TIER_ENTERPRISE (2): Enterprise tier. """ + SEARCH_TIER_UNSPECIFIED = 0 SEARCH_TIER_STANDARD = 1 SEARCH_TIER_ENTERPRISE = 2 @@ -137,6 +142,7 @@ class SearchAddOn(proto.Enum): SEARCH_ADD_ON_LLM (1): Large language model add-on. """ + SEARCH_ADD_ON_UNSPECIFIED = 0 SEARCH_ADD_ON_LLM = 1 @@ -155,6 +161,7 @@ class FileOriginType(proto.Enum): The file was generated from other files by an internal process. """ + FILE_ORIGIN_TYPE_UNSPECIFIED = 0 USER_PROVIDED = 1 AI_GENERATED = 2 @@ -391,6 +398,7 @@ class IdpType(proto.Enum): THIRD_PARTY (2): Third party provider. """ + IDP_TYPE_UNSPECIFIED = 0 GSUITE = 1 THIRD_PARTY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py index db1f8d363f04..9e6e072a0215 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -54,6 +55,7 @@ class MatchOperator(proto.Enum): CONTAINS (2): If the suggestion contains the block_phrase, then block it. """ + MATCH_OPERATOR_UNSPECIFIED = 0 EXACT_MATCH = 1 CONTAINS = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion_service.py index 25ce134fadff..6251cb01c10f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/completion_service.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -46,24 +47,24 @@ class CompleteQueryRequest(proto.Message): model specified in the Configuration > Autocomplete section of the Cloud console. Currently supported values: - - ``document`` - Using suggestions generated from - user-imported documents. - - ``search-history`` - Using suggestions generated from the - past history of - [SearchService.Search][google.cloud.discoveryengine.v1alpha.SearchService.Search] - API calls. Do not use it when there is no traffic for - Search API. - - ``user-event`` - Using suggestions generated from - user-imported search events. - - ``document-completable`` - Using suggestions taken - directly from user-imported document fields marked as - completable. + - ``document`` - Using suggestions generated from + user-imported documents. + - ``search-history`` - Using suggestions generated from the + past history of + [SearchService.Search][google.cloud.discoveryengine.v1alpha.SearchService.Search] + API calls. Do not use it when there is no traffic for + Search API. + - ``user-event`` - Using suggestions generated from + user-imported search events. + - ``document-completable`` - Using suggestions taken + directly from user-imported document fields marked as + completable. Default values: - - ``document`` is the default model for regular dataStores. - - ``search-history`` is the default model for site search - dataStores. + - ``document`` is the default model for regular dataStores. + - ``search-history`` is the default model for site search + dataStores. user_pseudo_id (str): A unique identifier for tracking visitors. For example, this could be implemented with an HTTP cookie, which should be diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control.py index 00d7e933146b..c226bcc104db 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import common +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control_service.py index bf70951accd8..c97d16548aac 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/control_service.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import control as gcd_control +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -80,8 +81,8 @@ class UpdateControlRequest(proto.Message): [Control][google.cloud.discoveryengine.v1alpha.Control] to update. The following are NOT supported: - - [Control.name][google.cloud.discoveryengine.v1alpha.Control.name] - - [Control.solution_type][google.cloud.discoveryengine.v1alpha.Control.solution_type] + - [Control.name][google.cloud.discoveryengine.v1alpha.Control.name] + - [Control.solution_type][google.cloud.discoveryengine.v1alpha.Control.solution_type] If not set or empty, all supported fields are updated. """ @@ -150,9 +151,9 @@ class ListControlsRequest(proto.Message): Optional. A filter to apply on the list results. Supported features: - - List all the products under the parent branch if - [filter][google.cloud.discoveryengine.v1alpha.ListControlsRequest.filter] - is unset. Currently this field is unsupported. + - List all the products under the parent branch if + [filter][google.cloud.discoveryengine.v1alpha.ListControlsRequest.filter] + is unset. Currently this field is unsupported. """ parent: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py index 363e242f7a1c..389dedfac198 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversation.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_service +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -68,6 +69,7 @@ class State(proto.Enum): COMPLETED (2): Conversation has been completed. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py index 03248e2fd0d7..2c85fb4c186e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/conversational_search_service.py @@ -17,14 +17,15 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1alpha.types import answer as gcd_answer from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1alpha.types import search_service from google.cloud.discoveryengine_v1alpha.types import session as gcd_session +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -81,20 +82,20 @@ class ConverseConversationRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -204,12 +205,12 @@ class ConverseConversationResponse(proto.Message): proto.STRING, number=6, ) - search_results: MutableSequence[ - search_service.SearchResponse.SearchResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=search_service.SearchResponse.SearchResult, + search_results: MutableSequence[search_service.SearchResponse.SearchResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=search_service.SearchResponse.SearchResult, + ) ) @@ -246,7 +247,7 @@ class UpdateConversationRequest(proto.Message): [Conversation][google.cloud.discoveryengine.v1alpha.Conversation] to update. The following are NOT supported: - - [Conversation.name][google.cloud.discoveryengine.v1alpha.Conversation.name] + - [Conversation.name][google.cloud.discoveryengine.v1alpha.Conversation.name] If not set or empty, all supported fields are updated. """ @@ -319,9 +320,9 @@ class ListConversationsRequest(proto.Message): ascending order. Use "desc" after a field name for descending. Supported fields: - - ``update_time`` - - ``create_time`` - - ``conversation_name`` + - ``update_time`` + - ``create_time`` + - ``conversation_name`` Example: "update_time desc" "create_time". """ @@ -437,20 +438,20 @@ class AnswerQueryRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -935,6 +936,7 @@ class Type(proto.Enum): JAIL_BREAKING_QUERY (3): Jail-breaking query classification type. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 @@ -1121,7 +1123,7 @@ class UpdateSessionRequest(proto.Message): [Session][google.cloud.discoveryengine.v1alpha.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1alpha.Session.name] + - [Session.name][google.cloud.discoveryengine.v1alpha.Session.name] If not set or empty, all supported fields are updated. """ @@ -1194,14 +1196,14 @@ class ListSessionsRequest(proto.Message): A comma-separated list of fields to filter by, in EBNF grammar. The supported fields are: - - ``user_pseudo_id`` - - ``state`` - - ``display_name`` - - ``starred`` - - ``is_pinned`` - - ``labels`` - - ``create_time`` - - ``update_time`` + - ``user_pseudo_id`` + - ``state`` + - ``display_name`` + - ``starred`` + - ``is_pinned`` + - ``labels`` + - ``create_time`` + - ``update_time`` Examples: "user_pseudo_id = some_id" "display_name = "some_name"" "starred = true" "is_pinned=true AND (NOT @@ -1211,17 +1213,17 @@ class ListSessionsRequest(proto.Message): ascending order. Use "desc" after a field name for descending. Supported fields: - - ``update_time`` - - ``create_time`` - - ``session_name`` - - ``is_pinned`` + - ``update_time`` + - ``create_time`` + - ``session_name`` + - ``is_pinned`` Example: - - "update_time desc" - - "create_time" - - "is_pinned desc,update_time desc": list sessions by - is_pinned first, then by update_time. + - "update_time desc" + - "create_time" + - "is_pinned desc,update_time desc": list sessions by + is_pinned first, then by update_time. """ parent: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py index dd6c72e94ddf..b7062b7163e7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/custom_tuning_model.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -78,6 +80,7 @@ class ModelState(proto.Enum): Input data validation failed. Model training didn't start. """ + MODEL_STATE_UNSPECIFIED = 0 TRAINING_PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py index 39a172f176e2..68c9ea2e843b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store.py @@ -17,14 +17,15 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.discoveryengine_v1alpha.types import schema +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -61,10 +62,11 @@ class DataStore(proto.Message): solutions for each [industry_vertical][google.cloud.discoveryengine.v1alpha.DataStore.industry_vertical]: - - ``MEDIA``: ``SOLUTION_TYPE_RECOMMENDATION`` and - ``SOLUTION_TYPE_SEARCH``. - - ``SITE_SEARCH``: ``SOLUTION_TYPE_SEARCH`` is automatically - enrolled. Other solutions cannot be enrolled. + - ``MEDIA``: ``SOLUTION_TYPE_RECOMMENDATION`` and + ``SOLUTION_TYPE_SEARCH``. + - ``SITE_SEARCH``: ``SOLUTION_TYPE_SEARCH`` is + automatically enrolled. Other solutions cannot be + enrolled. default_schema_id (str): Output only. The id of the default [Schema][google.cloud.discoveryengine.v1alpha.Schema] @@ -149,6 +151,7 @@ class ContentConfig(proto.Enum): workspace data store are specified in the [WorkspaceConfig][google.cloud.discoveryengine.v1alpha.WorkspaceConfig]. """ + CONTENT_CONFIG_UNSPECIFIED = 0 NO_CONTENT = 1 CONTENT_REQUIRED = 2 @@ -289,6 +292,7 @@ class Type(proto.Enum): GOOGLE_KEEP (7): Workspace Data Store contains Keep data """ + TYPE_UNSPECIFIED = 0 GOOGLE_DRIVE = 1 GOOGLE_MAIL = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store_service.py index 2547cd08e41d..92d72ab7df6f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/data_store_service.py @@ -17,14 +17,15 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -383,7 +384,7 @@ class UpdateDocumentProcessingConfigRequest(proto.Message): [DocumentProcessingConfig][google.cloud.discoveryengine.v1alpha.DocumentProcessingConfig] to update. The following are the only supported fields: - - [DocumentProcessingConfig.ocr_config][google.cloud.discoveryengine.v1alpha.DocumentProcessingConfig.ocr_config] + - [DocumentProcessingConfig.ocr_config][google.cloud.discoveryengine.v1alpha.DocumentProcessingConfig.ocr_config] If not set, all supported fields are updated. """ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py index 8c516cd2895f..f148cfcc4337 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + +from google.cloud.discoveryengine_v1alpha.types import common from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import common __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -100,11 +101,11 @@ class Document(proto.Message): index_status (google.cloud.discoveryengine_v1alpha.types.Document.IndexStatus): Output only. The index status of the document. - - If document is indexed successfully, the index_time field - is populated. - - Otherwise, if document is not indexed due to errors, the - error_samples field is populated. - - Otherwise, index_status is unset. + - If document is indexed successfully, the index_time field + is populated. + - Otherwise, if document is not indexed due to errors, the + error_samples field is populated. + - Otherwise, index_status is unset. """ class Content(proto.Message): @@ -140,14 +141,14 @@ class Content(proto.Message): mime_type (str): The MIME type of the content. Supported types: - - ``application/pdf`` (PDF, only native PDFs are supported - for now) - - ``text/html`` (HTML) - - ``application/vnd.openxmlformats-officedocument.wordprocessingml.document`` - (DOCX) - - ``application/vnd.openxmlformats-officedocument.presentationml.presentation`` - (PPTX) - - ``text/plain`` (TXT) + - ``application/pdf`` (PDF, only native PDFs are supported + for now) + - ``text/html`` (HTML) + - ``application/vnd.openxmlformats-officedocument.wordprocessingml.document`` + (DOCX) + - ``application/vnd.openxmlformats-officedocument.presentationml.presentation`` + (PPTX) + - ``text/plain`` (TXT) See https://www.iana.org/assignments/media-types/media-types.xhtml. @@ -212,12 +213,12 @@ class AccessRestriction(proto.Message): number=2, ) - readers: MutableSequence[ - "Document.AclInfo.AccessRestriction" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="Document.AclInfo.AccessRestriction", + readers: MutableSequence["Document.AclInfo.AccessRestriction"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Document.AclInfo.AccessRestriction", + ) ) class IndexStatus(proto.Message): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_processing_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_processing_config.py index 54ec21fe6151..0b0235db7c00 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_processing_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_processing_config.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -53,17 +54,17 @@ class DocumentProcessingConfig(proto.Message): Map from file type to override the default parsing configuration based on the file type. Supported keys: - - ``pdf``: Override parsing config for PDF files, either - digital parsing, ocr parsing or layout parsing is - supported. - - ``html``: Override parsing config for HTML files, only - digital parsing and layout parsing are supported. - - ``docx``: Override parsing config for DOCX files, only - digital parsing and layout parsing are supported. - - ``pptx``: Override parsing config for PPTX files, only - digital parsing and layout parsing are supported. - - ``xlsx``: Override parsing config for XLSX files, only - digital parsing and layout parsing are supported. + - ``pdf``: Override parsing config for PDF files, either + digital parsing, ocr parsing or layout parsing is + supported. + - ``html``: Override parsing config for HTML files, only + digital parsing and layout parsing are supported. + - ``docx``: Override parsing config for DOCX files, only + digital parsing and layout parsing are supported. + - ``pptx``: Override parsing config for PPTX files, only + digital parsing and layout parsing are supported. + - ``xlsx``: Override parsing config for XLSX files, only + digital parsing and layout parsing are supported. """ class ChunkingConfig(proto.Message): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py index 37f30745eb28..aadc0bcd5155 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/document_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import document as gcd_document +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -317,6 +318,7 @@ class ProcessedDocumentType(proto.Enum): Returns the converted Image bytes (as JPEG or PNG) if available. """ + PROCESSED_DOCUMENT_TYPE_UNSPECIFIED = 0 PARSED_DOCUMENT = 1 CHUNKED_DOCUMENT = 2 @@ -333,6 +335,7 @@ class ProcessedDocumentFormat(proto.Enum): Output format is a JSON string representation of processed document. """ + PROCESSED_DOCUMENT_FORMAT_UNSPECIFIED = 0 JSON = 1 @@ -446,6 +449,7 @@ class State(proto.Enum): [Document][google.cloud.discoveryengine.v1alpha.Document] is not indexed. """ + STATE_UNSPECIFIED = 0 INDEXED = 1 NOT_IN_TARGET_SITE = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py index 42a29402806a..d44bdf8961e6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import common +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -238,6 +239,7 @@ class TrainingState(proto.Enum): TRAINING (2): The engine is training. """ + TRAINING_STATE_UNSPECIFIED = 0 PAUSED = 1 TRAINING = 2 @@ -443,6 +445,7 @@ class ServingState(proto.Enum): The engine is trained on tuned hyperparameters and can be queried. """ + SERVING_STATE_UNSPECIFIED = 0 INACTIVE = 1 ACTIVE = 2 @@ -463,6 +466,7 @@ class DataState(proto.Enum): data. Error messages can be queried via Stackdriver. """ + DATA_STATE_UNSPECIFIED = 0 DATA_OK = 1 DATA_ERROR = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine_service.py index 2c97a5d28828..144b55ad0525 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/engine_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/estimate_billing_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/estimate_billing_service.py index 11db5f0dd9b7..1c67e2bef525 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/estimate_billing_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/estimate_billing_service.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import import_config +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py index adfc5ebade66..d5447ab04aab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import search_service +from google.protobuf import timestamp_pb2 # type: ignore +from google.rpc import status_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -92,6 +93,7 @@ class State(proto.Enum): FAILED (4): The evaluation failed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -112,13 +114,13 @@ class EvaluationSpec(proto.Message): supported; if any other fields are provided, an UNSUPPORTED error will be returned: - - [SearchRequest.serving_config][google.cloud.discoveryengine.v1alpha.SearchRequest.serving_config] - - [SearchRequest.branch][google.cloud.discoveryengine.v1alpha.SearchRequest.branch] - - [SearchRequest.canonical_filter][google.cloud.discoveryengine.v1alpha.SearchRequest.canonical_filter] - - [SearchRequest.query_expansion_spec][google.cloud.discoveryengine.v1alpha.SearchRequest.query_expansion_spec] - - [SearchRequest.spell_correction_spec][google.cloud.discoveryengine.v1alpha.SearchRequest.spell_correction_spec] - - [SearchRequest.content_search_spec][google.cloud.discoveryengine.v1alpha.SearchRequest.content_search_spec] - - [SearchRequest.user_pseudo_id][google.cloud.discoveryengine.v1alpha.SearchRequest.user_pseudo_id] + - [SearchRequest.serving_config][google.cloud.discoveryengine.v1alpha.SearchRequest.serving_config] + - [SearchRequest.branch][google.cloud.discoveryengine.v1alpha.SearchRequest.branch] + - [SearchRequest.canonical_filter][google.cloud.discoveryengine.v1alpha.SearchRequest.canonical_filter] + - [SearchRequest.query_expansion_spec][google.cloud.discoveryengine.v1alpha.SearchRequest.query_expansion_spec] + - [SearchRequest.spell_correction_spec][google.cloud.discoveryengine.v1alpha.SearchRequest.spell_correction_spec] + - [SearchRequest.content_search_spec][google.cloud.discoveryengine.v1alpha.SearchRequest.content_search_spec] + - [SearchRequest.user_pseudo_id][google.cloud.discoveryengine.v1alpha.SearchRequest.user_pseudo_id] This field is a member of `oneof`_ ``search_spec``. query_set_spec (google.cloud.discoveryengine_v1alpha.types.Evaluation.EvaluationSpec.QuerySetSpec): @@ -206,10 +208,10 @@ class QualityMetrics(proto.Message): Example (top-5): - - For a single - [SampleQuery][google.cloud.discoveryengine.v1alpha.SampleQuery], - If 3 out of 5 relevant documents are retrieved in the - top-5, recall@5 = 3/5 = 0.6 + - For a single + [SampleQuery][google.cloud.discoveryengine.v1alpha.SampleQuery], + If 3 out of 5 relevant documents are retrieved in the + top-5, recall@5 = 3/5 = 0.6 doc_precision (google.cloud.discoveryengine_v1alpha.types.QualityMetrics.TopkMetrics): Precision per document, at various top-k cutoff levels. @@ -218,10 +220,10 @@ class QualityMetrics(proto.Message): Example (top-5): - - For a single - [SampleQuery][google.cloud.discoveryengine.v1alpha.SampleQuery], - If 4 out of 5 retrieved documents in the top-5 are - relevant, precision@5 = 4/5 = 0.8 + - For a single + [SampleQuery][google.cloud.discoveryengine.v1alpha.SampleQuery], + If 4 out of 5 retrieved documents in the top-5 are + relevant, precision@5 = 4/5 = 0.8 doc_ndcg (google.cloud.discoveryengine_v1alpha.types.QualityMetrics.TopkMetrics): Normalized discounted cumulative gain (NDCG) per document, at various top-k cutoff levels. @@ -250,10 +252,10 @@ class QualityMetrics(proto.Message): Example (top-5): - - For a single - [SampleQuery][google.cloud.discoveryengine.v1alpha.SampleQuery], - if 3 out of 5 relevant pages are retrieved in the top-5, - recall@5 = 3/5 = 0.6 + - For a single + [SampleQuery][google.cloud.discoveryengine.v1alpha.SampleQuery], + if 3 out of 5 relevant pages are retrieved in the top-5, + recall@5 = 3/5 = 0.6 page_ndcg (google.cloud.discoveryengine_v1alpha.types.QualityMetrics.TopkMetrics): Normalized discounted cumulative gain (NDCG) per page, at various top-k cutoff levels. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation_service.py index 9f1f49fe4228..da54ae464edd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/evaluation_service.py @@ -22,6 +22,7 @@ from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/grounded_generation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/grounded_generation_service.py index 9b8178e5fd55..30330c6e3779 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/grounded_generation_service.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1alpha.types import grounding + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -76,20 +77,20 @@ class CheckGroundingRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/grounding.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/grounding.py index 623c792cc652..24e4aa0106c0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/grounding.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/grounding.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py index abf627df7402..4793a5433b21 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/import_config.py @@ -17,18 +17,17 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + +from google.cloud.discoveryengine_v1alpha.types import completion +from google.cloud.discoveryengine_v1alpha.types import document +from google.cloud.discoveryengine_v1alpha.types import sample_query +from google.cloud.discoveryengine_v1alpha.types import user_event from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore from google.type import date_pb2 # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - completion, - document, - sample_query, - user_event, -) __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -81,30 +80,30 @@ class GcsSource(proto.Message): Supported values for document imports: - - ``document`` (default): One JSON - [Document][google.cloud.discoveryengine.v1alpha.Document] - per line. Each document must have a valid - [Document.id][google.cloud.discoveryengine.v1alpha.Document.id]. - - ``content``: Unstructured data (e.g. PDF, HTML). Each file - matched by ``input_uris`` becomes a document, with the ID - set to the first 128 bits of SHA256(URI) encoded as a hex - string. - - ``custom``: One custom data JSON per row in arbitrary - format that conforms to the defined - [Schema][google.cloud.discoveryengine.v1alpha.Schema] of - the data store. This can only be used by the GENERIC Data - Store vertical. - - ``csv``: A CSV file with header conforming to the defined - [Schema][google.cloud.discoveryengine.v1alpha.Schema] of - the data store. Each entry after the header is imported as - a Document. This can only be used by the GENERIC Data - Store vertical. + - ``document`` (default): One JSON + [Document][google.cloud.discoveryengine.v1alpha.Document] + per line. Each document must have a valid + [Document.id][google.cloud.discoveryengine.v1alpha.Document.id]. + - ``content``: Unstructured data (e.g. PDF, HTML). Each + file matched by ``input_uris`` becomes a document, with + the ID set to the first 128 bits of SHA256(URI) encoded + as a hex string. + - ``custom``: One custom data JSON per row in arbitrary + format that conforms to the defined + [Schema][google.cloud.discoveryengine.v1alpha.Schema] of + the data store. This can only be used by the GENERIC Data + Store vertical. + - ``csv``: A CSV file with header conforming to the defined + [Schema][google.cloud.discoveryengine.v1alpha.Schema] of + the data store. Each entry after the header is imported + as a Document. This can only be used by the GENERIC Data + Store vertical. Supported values for user event imports: - - ``user_event`` (default): One JSON - [UserEvent][google.cloud.discoveryengine.v1alpha.UserEvent] - per line. + - ``user_event`` (default): One JSON + [UserEvent][google.cloud.discoveryengine.v1alpha.UserEvent] + per line. """ input_uris: MutableSequence[str] = proto.RepeatedField( @@ -151,25 +150,25 @@ class BigQuerySource(proto.Message): Supported values for user event imports: - - ``user_event`` (default): One - [UserEvent][google.cloud.discoveryengine.v1alpha.UserEvent] - per row. + - ``user_event`` (default): One + [UserEvent][google.cloud.discoveryengine.v1alpha.UserEvent] + per row. Supported values for document imports: - - ``document`` (default): One - [Document][google.cloud.discoveryengine.v1alpha.Document] - format per row. Each document must have a valid - [Document.id][google.cloud.discoveryengine.v1alpha.Document.id] - and one of - [Document.json_data][google.cloud.discoveryengine.v1alpha.Document.json_data] - or - [Document.struct_data][google.cloud.discoveryengine.v1alpha.Document.struct_data]. - - ``custom``: One custom data per row in arbitrary format - that conforms to the defined - [Schema][google.cloud.discoveryengine.v1alpha.Schema] of - the data store. This can only be used by the GENERIC Data - Store vertical. + - ``document`` (default): One + [Document][google.cloud.discoveryengine.v1alpha.Document] + format per row. Each document must have a valid + [Document.id][google.cloud.discoveryengine.v1alpha.Document.id] + and one of + [Document.json_data][google.cloud.discoveryengine.v1alpha.Document.json_data] + or + [Document.struct_data][google.cloud.discoveryengine.v1alpha.Document.struct_data]. + - ``custom``: One custom data per row in arbitrary format + that conforms to the defined + [Schema][google.cloud.discoveryengine.v1alpha.Schema] of + the data store. This can only be used by the GENERIC Data + Store vertical. """ partition_date: date_pb2.Date = proto.Field( @@ -286,6 +285,7 @@ class Type(proto.Enum): JSON (7): JSON type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -306,6 +306,7 @@ class Encoding(proto.Enum): BINARY (2): Binary encoding. """ + ENCODING_UNSPECIFIED = 0 TEXT = 1 BINARY = 2 @@ -325,11 +326,11 @@ class BigtableColumnFamily(proto.Message): The encoding mode of the values when the type is not STRING. Acceptable encoding values are: - - ``TEXT``: indicates values are alphanumeric text strings. - - ``BINARY``: indicates values are encoded using - ``HBase Bytes.toBytes`` family of functions. This can be - overridden for a specific column by listing that column in - ``columns`` and specifying an encoding for it. + - ``TEXT``: indicates values are alphanumeric text strings. + - ``BINARY``: indicates values are encoded using + ``HBase Bytes.toBytes`` family of functions. This can be + overridden for a specific column by listing that column + in ``columns`` and specifying an encoding for it. type_ (google.cloud.discoveryengine_v1alpha.types.BigtableOptions.Type): The type of values in this column family. The values are expected to be encoded using ``HBase Bytes.toBytes`` @@ -354,12 +355,12 @@ class BigtableColumnFamily(proto.Message): number=3, enum="BigtableOptions.Type", ) - columns: MutableSequence[ - "BigtableOptions.BigtableColumn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BigtableOptions.BigtableColumn", + columns: MutableSequence["BigtableOptions.BigtableColumn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BigtableOptions.BigtableColumn", + ) ) class BigtableColumn(proto.Message): @@ -381,11 +382,11 @@ class BigtableColumn(proto.Message): The encoding mode of the values when the type is not ``STRING``. Acceptable encoding values are: - - ``TEXT``: indicates values are alphanumeric text strings. - - ``BINARY``: indicates values are encoded using - ``HBase Bytes.toBytes`` family of functions. This can be - overridden for a specific column by listing that column in - ``columns`` and specifying an encoding for it. + - ``TEXT``: indicates values are alphanumeric text strings. + - ``BINARY``: indicates values are encoded using + ``HBase Bytes.toBytes`` family of functions. This can be + overridden for a specific column by listing that column + in ``columns`` and specifying an encoding for it. type_ (google.cloud.discoveryengine_v1alpha.types.BigtableOptions.Type): The type of values in this column family. The values are expected to be encoded using ``HBase Bytes.toBytes`` @@ -972,18 +973,18 @@ class ImportDocumentsRequest(proto.Message): Supported data sources: - - [GcsSource][google.cloud.discoveryengine.v1alpha.GcsSource]. - [GcsSource.data_schema][google.cloud.discoveryengine.v1alpha.GcsSource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [BigQuerySource][google.cloud.discoveryengine.v1alpha.BigQuerySource]. - [BigQuerySource.data_schema][google.cloud.discoveryengine.v1alpha.BigQuerySource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [SpannerSource][google.cloud.discoveryengine.v1alpha.SpannerSource]. - - [CloudSqlSource][google.cloud.discoveryengine.v1alpha.CloudSqlSource]. - - [FirestoreSource][google.cloud.discoveryengine.v1alpha.FirestoreSource]. - - [BigtableSource][google.cloud.discoveryengine.v1alpha.BigtableSource]. + - [GcsSource][google.cloud.discoveryengine.v1alpha.GcsSource]. + [GcsSource.data_schema][google.cloud.discoveryengine.v1alpha.GcsSource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [BigQuerySource][google.cloud.discoveryengine.v1alpha.BigQuerySource]. + [BigQuerySource.data_schema][google.cloud.discoveryengine.v1alpha.BigQuerySource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [SpannerSource][google.cloud.discoveryengine.v1alpha.SpannerSource]. + - [CloudSqlSource][google.cloud.discoveryengine.v1alpha.CloudSqlSource]. + - [FirestoreSource][google.cloud.discoveryengine.v1alpha.FirestoreSource]. + - [BigtableSource][google.cloud.discoveryengine.v1alpha.BigtableSource]. id_field (str): The field indicates the ID field or column to be used as unique IDs of the documents. @@ -1013,18 +1014,18 @@ class ImportDocumentsRequest(proto.Message): Supported data sources: - - [GcsSource][google.cloud.discoveryengine.v1alpha.GcsSource]. - [GcsSource.data_schema][google.cloud.discoveryengine.v1alpha.GcsSource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [BigQuerySource][google.cloud.discoveryengine.v1alpha.BigQuerySource]. - [BigQuerySource.data_schema][google.cloud.discoveryengine.v1alpha.BigQuerySource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [SpannerSource][google.cloud.discoveryengine.v1alpha.SpannerSource]. - - [CloudSqlSource][google.cloud.discoveryengine.v1alpha.CloudSqlSource]. - - [FirestoreSource][google.cloud.discoveryengine.v1alpha.FirestoreSource]. - - [BigtableSource][google.cloud.discoveryengine.v1alpha.BigtableSource]. + - [GcsSource][google.cloud.discoveryengine.v1alpha.GcsSource]. + [GcsSource.data_schema][google.cloud.discoveryengine.v1alpha.GcsSource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [BigQuerySource][google.cloud.discoveryengine.v1alpha.BigQuerySource]. + [BigQuerySource.data_schema][google.cloud.discoveryengine.v1alpha.BigQuerySource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [SpannerSource][google.cloud.discoveryengine.v1alpha.SpannerSource]. + - [CloudSqlSource][google.cloud.discoveryengine.v1alpha.CloudSqlSource]. + - [FirestoreSource][google.cloud.discoveryengine.v1alpha.FirestoreSource]. + - [BigtableSource][google.cloud.discoveryengine.v1alpha.BigtableSource]. """ class ReconciliationMode(proto.Enum): @@ -1043,6 +1044,7 @@ class ReconciliationMode(proto.Enum): deleted if they are not present in the source location. """ + RECONCILIATION_MODE_UNSPECIFIED = 0 INCREMENTAL = 1 FULL = 2 @@ -1201,8 +1203,8 @@ class ImportSuggestionDenyListEntriesRequest(proto.Message): import. Supported values ``gcs_source.schema`` for autocomplete suggestion deny list entry imports: - - ``suggestion_deny_list`` (default): One JSON - [SuggestionDenyListEntry] per line. + - ``suggestion_deny_list`` (default): One JSON + [SuggestionDenyListEntry] per line. This field is a member of `oneof`_ ``source``. parent (str): @@ -1220,12 +1222,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - entries: MutableSequence[ - completion.SuggestionDenyListEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.SuggestionDenyListEntry, + entries: MutableSequence[completion.SuggestionDenyListEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.SuggestionDenyListEntry, + ) ) inline_source: InlineSource = proto.Field( @@ -1348,12 +1350,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - suggestions: MutableSequence[ - completion.CompletionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.CompletionSuggestion, + suggestions: MutableSequence[completion.CompletionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.CompletionSuggestion, + ) ) inline_source: InlineSource = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py index 4fbc542736c7..6524265795da 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -60,11 +62,11 @@ class ServiceTerms(proto.Message): The unique identifier of this terms of service. Available terms: - - ``GA_DATA_USE_TERMS``: `Terms for data - use `__. - When using this as ``id``, the acceptable - [version][google.cloud.discoveryengine.v1alpha.Project.ServiceTerms.version] - to provide is ``2022-11-23``. + - ``GA_DATA_USE_TERMS``: `Terms for data + use `__. + When using this as ``id``, the acceptable + [version][google.cloud.discoveryengine.v1alpha.Project.ServiceTerms.version] + to provide is ``2022-11-23``. version (str): The version string of the terms of service. For acceptable values, see the comments for @@ -98,6 +100,7 @@ class State(proto.Enum): The project has declined or revoked the agreement to terms of service. """ + STATE_UNSPECIFIED = 0 TERMS_ACCEPTED = 1 TERMS_PENDING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py index 1b8fe4e3315b..0e5a6dd89064 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/project_service.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -105,11 +106,11 @@ class ReportConsentChangeRequest(proto.Message): Required. The unique identifier of the terms of service to update. Available term ids: - - ``GA_DATA_USE_TERMS``: `Terms for data - use `__. - When using this service term id, the acceptable - [service_term_version][google.cloud.discoveryengine.v1alpha.ReportConsentChangeRequest.service_term_version] - to provide is ``2022-11-23``. + - ``GA_DATA_USE_TERMS``: `Terms for data + use `__. + When using this service term id, the acceptable + [service_term_version][google.cloud.discoveryengine.v1alpha.ReportConsentChangeRequest.service_term_version] + to provide is ``2022-11-23``. service_term_version (str): Required. The version string of the terms of service to update. @@ -127,6 +128,7 @@ class ConsentChangeAction(proto.Enum): ACCEPT (1): User accepts service terms. """ + CONSENT_CHANGE_ACTION_UNSPECIFIED = 0 ACCEPT = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/purge_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/purge_config.py index f7c0e7ac2f29..52b5217282a2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/purge_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/purge_config.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import import_config +from google.protobuf import timestamp_pb2 # type: ignore +from google.rpc import status_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -56,23 +57,23 @@ class PurgeUserEventsRequest(proto.Message): deleted with a length limit of 5,000 characters. The eligible fields for filtering are: - - ``eventType``: Double quoted - [UserEvent.event_type][google.cloud.discoveryengine.v1alpha.UserEvent.event_type] - string. - - ``eventTime``: in ISO 8601 "zulu" format. - - ``userPseudoId``: Double quoted string. Specifying this - will delete all events associated with a visitor. - - ``userId``: Double quoted string. Specifying this will - delete all events associated with a user. + - ``eventType``: Double quoted + [UserEvent.event_type][google.cloud.discoveryengine.v1alpha.UserEvent.event_type] + string. + - ``eventTime``: in ISO 8601 "zulu" format. + - ``userPseudoId``: Double quoted string. Specifying this + will delete all events associated with a visitor. + - ``userId``: Double quoted string. Specifying this will + delete all events associated with a user. Examples: - - Deleting all events in a time range: - ``eventTime > "2012-04-23T18:25:43.511Z" eventTime < "2012-04-23T18:30:43.511Z"`` - - Deleting specific eventType: ``eventType = "search"`` - - Deleting all events for a specific visitor: - ``userPseudoId = "visitor1024"`` - - Deleting all events inside a DataStore: ``*`` + - Deleting all events in a time range: + ``eventTime > "2012-04-23T18:25:43.511Z" eventTime < "2012-04-23T18:30:43.511Z"`` + - Deleting specific eventType: ``eventType = "search"`` + - Deleting all events for a specific visitor: + ``userPseudoId = "visitor1024"`` + - Deleting all events inside a DataStore: ``*`` The filtering fields are assumed to have an implicit AND. force (bool): @@ -193,9 +194,9 @@ class PurgeDocumentsRequest(proto.Message): Cloud Storage location for the input content. Supported ``data_schema``: - - ``document_id``: One valid - [Document.id][google.cloud.discoveryengine.v1alpha.Document.id] - per line. + - ``document_id``: One valid + [Document.id][google.cloud.discoveryengine.v1alpha.Document.id] + per line. This field is a member of `oneof`_ ``source``. inline_source (google.cloud.discoveryengine_v1alpha.types.PurgeDocumentsRequest.InlineSource): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/rank_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/rank_service.py index 10344f5ca79f..5f31c9098e57 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/rank_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/rank_service.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -85,8 +86,8 @@ class RankRequest(proto.Message): model (str): The identifier of the model to use. It is one of: - - ``semantic-ranker-512@latest``: Semantic ranking model - with maxiumn input token size 512. + - ``semantic-ranker-512@latest``: Semantic ranking model + with maxiumn input token size 512. It is set to ``semantic-ranker-512@latest`` by default if unspecified. @@ -107,20 +108,20 @@ class RankRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py index db06b8c5820a..aad09a42dd51 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/recommendation_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import user_event as gcd_user_event from google.cloud.discoveryengine_v1alpha.types import document as gcd_document +from google.cloud.discoveryengine_v1alpha.types import user_event as gcd_user_event +from google.protobuf import struct_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -84,18 +85,18 @@ class RecommendRequest(proto.Message): Examples: - - ``(filter_tags: ANY("Red", "Blue") OR filter_tags: ANY("Hot", "Cold"))`` - - ``(filter_tags: ANY("Red", "Blue")) AND NOT (filter_tags: ANY("Green"))`` + - ``(filter_tags: ANY("Red", "Blue") OR filter_tags: ANY("Hot", "Cold"))`` + - ``(filter_tags: ANY("Red", "Blue")) AND NOT (filter_tags: ANY("Green"))`` If ``attributeFilteringSyntax`` is set to true under the ``params`` field, then attribute-based expressions are expected instead of the above described tag-based syntax. Examples: - - (launguage: ANY("en", "es")) AND NOT (categories: - ANY("Movie")) - - (available: true) AND (launguage: ANY("en", "es")) OR - (categories: ANY("Movie")) + - (launguage: ANY("en", "es")) AND NOT (categories: + ANY("Movie")) + - (available: true) AND (launguage: ANY("en", "es")) OR + (categories: ANY("Movie")) If your filter blocks all results, the API returns generic (unfiltered) popular Documents. If you only want results @@ -119,51 +120,51 @@ class RecommendRequest(proto.Message): Allowed values: - - ``returnDocument``: Boolean. If set to ``true``, the - associated Document object is returned in - [RecommendResponse.RecommendationResult.document][google.cloud.discoveryengine.v1alpha.RecommendResponse.RecommendationResult.document]. - - ``returnScore``: Boolean. If set to true, the - recommendation score corresponding to each returned - Document is set in - [RecommendResponse.RecommendationResult.metadata][google.cloud.discoveryengine.v1alpha.RecommendResponse.RecommendationResult.metadata]. - The given score indicates the probability of a Document - conversion given the user's context and history. - - ``strictFiltering``: Boolean. True by default. If set to - ``false``, the service returns generic (unfiltered) - popular Documents instead of empty if your filter blocks - all recommendation results. - - ``diversityLevel``: String. Default empty. If set to be - non-empty, then it needs to be one of: - - - ``no-diversity`` - - ``low-diversity`` - - ``medium-diversity`` - - ``high-diversity`` - - ``auto-diversity`` This gives request-level control and - adjusts recommendation results based on Document - category. - - - ``attributeFilteringSyntax``: Boolean. False by default. - If set to true, the ``filter`` field is interpreted - according to the new, attribute-based syntax. + - ``returnDocument``: Boolean. If set to ``true``, the + associated Document object is returned in + [RecommendResponse.RecommendationResult.document][google.cloud.discoveryengine.v1alpha.RecommendResponse.RecommendationResult.document]. + - ``returnScore``: Boolean. If set to true, the + recommendation score corresponding to each returned + Document is set in + [RecommendResponse.RecommendationResult.metadata][google.cloud.discoveryengine.v1alpha.RecommendResponse.RecommendationResult.metadata]. + The given score indicates the probability of a Document + conversion given the user's context and history. + - ``strictFiltering``: Boolean. True by default. If set to + ``false``, the service returns generic (unfiltered) + popular Documents instead of empty if your filter blocks + all recommendation results. + - ``diversityLevel``: String. Default empty. If set to be + non-empty, then it needs to be one of: + + - ``no-diversity`` + - ``low-diversity`` + - ``medium-diversity`` + - ``high-diversity`` + - ``auto-diversity`` This gives request-level control + and adjusts recommendation results based on Document + category. + + - ``attributeFilteringSyntax``: Boolean. False by default. + If set to true, the ``filter`` field is interpreted + according to the new, attribute-based syntax. user_labels (MutableMapping[str, str]): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Requirements for labels `__ @@ -242,9 +243,9 @@ class RecommendationResult(proto.Message): Possible values: - - ``score``: Recommendation score in double value. Is set if - ``returnScore`` is set to true in - [RecommendRequest.params][google.cloud.discoveryengine.v1alpha.RecommendRequest.params]. + - ``score``: Recommendation score in double value. Is set + if ``returnScore`` is set to true in + [RecommendRequest.params][google.cloud.discoveryengine.v1alpha.RecommendRequest.params]. """ id: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query.py index e6d834a42d5c..644c2a791d9a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_service.py index 29a623493981..f51579141630 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_service.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set.py index 0b91372a0e2e..5e13c9fa0e20 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py index b493508c4cd9..d1434382eb0a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/sample_query_set_service.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -135,12 +136,12 @@ class ListSampleQuerySetsResponse(proto.Message): def raw_page(self): return self - sample_query_sets: MutableSequence[ - gcd_sample_query_set.SampleQuerySet - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_sample_query_set.SampleQuerySet, + sample_query_sets: MutableSequence[gcd_sample_query_set.SampleQuerySet] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_sample_query_set.SampleQuerySet, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py index c689e740ae89..b30aff4eaf44 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore +from google.protobuf import struct_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -259,8 +261,8 @@ class FieldConfig(proto.Message): starting from ``_root``, with a period ``.`` as the delimiter. Examples: - - Publish date of the root: \_root.datePublished - - Publish date of the reviews: \_root.review.datePublished + - Publish date of the root: \_root.datePublished + - Publish date of the reviews: \_root.review.datePublished """ class FieldType(proto.Enum): @@ -283,13 +285,13 @@ class FieldType(proto.Enum): Field value type is Geolocation. Geolocation is expressed as an object with the following keys: - - ``id``: a string representing the location id - - ``longitude``: a number representing the longitude - coordinate of the location - - ``latitude``: a number repesenting the latitude coordinate - of the location - - ``address``: a string representing the full address of the - location + - ``id``: a string representing the location id + - ``longitude``: a number representing the longitude + coordinate of the location + - ``latitude``: a number repesenting the latitude + coordinate of the location + - ``address``: a string representing the full address of + the location ``latitude`` and ``longitude`` must always be provided together. At least one of a) ``address`` or b) @@ -298,14 +300,15 @@ class FieldType(proto.Enum): Field value type is Datetime. Datetime can be expressed as either: - - a number representing milliseconds-since-the-epoch - - a string representing milliseconds-since-the-epoch. e.g. - ``"1420070400001"`` - - a string representing the `ISO - 8601 `__ date or - date and time. e.g. ``"2015-01-01"`` or - ``"2015-01-01T12:10:30Z"`` + - a number representing milliseconds-since-the-epoch + - a string representing milliseconds-since-the-epoch. e.g. + ``"1420070400001"`` + - a string representing the `ISO + 8601 `__ date or + date and time. e.g. ``"2015-01-01"`` or + ``"2015-01-01T12:10:30Z"`` """ + FIELD_TYPE_UNSPECIFIED = 0 OBJECT = 1 STRING = 2 @@ -326,6 +329,7 @@ class IndexableOption(proto.Enum): INDEXABLE_DISABLED (2): Indexable option disabled for a schema field. """ + INDEXABLE_OPTION_UNSPECIFIED = 0 INDEXABLE_ENABLED = 1 INDEXABLE_DISABLED = 2 @@ -343,6 +347,7 @@ class DynamicFacetableOption(proto.Enum): Dynamic facetable option disabled for a schema field. """ + DYNAMIC_FACETABLE_OPTION_UNSPECIFIED = 0 DYNAMIC_FACETABLE_ENABLED = 1 DYNAMIC_FACETABLE_DISABLED = 2 @@ -359,6 +364,7 @@ class SearchableOption(proto.Enum): Searchable option disabled for a schema field. """ + SEARCHABLE_OPTION_UNSPECIFIED = 0 SEARCHABLE_ENABLED = 1 SEARCHABLE_DISABLED = 2 @@ -376,6 +382,7 @@ class RetrievableOption(proto.Enum): Retrievable option disabled for a schema field. """ + RETRIEVABLE_OPTION_UNSPECIFIED = 0 RETRIEVABLE_ENABLED = 1 RETRIEVABLE_DISABLED = 2 @@ -393,6 +400,7 @@ class CompletableOption(proto.Enum): Completable option disabled for a schema field. """ + COMPLETABLE_OPTION_UNSPECIFIED = 0 COMPLETABLE_ENABLED = 1 COMPLETABLE_DISABLED = 2 @@ -409,6 +417,7 @@ class FilterableOption(proto.Enum): Filterable option disabled for a schema field. """ + FILTERABLE_OPTION_UNSPECIFIED = 0 FILTERABLE_ENABLED = 1 FILTERABLE_DISABLED = 2 @@ -430,6 +439,7 @@ class AdvancedSiteSearchDataSource(proto.Enum): SCHEMA_ORG (4): Retrieve value from schema.org data. """ + ADVANCED_SITE_SEARCH_DATA_SOURCE_UNSPECIFIED = 0 METATAGS = 1 PAGEMAP = 2 @@ -479,12 +489,12 @@ class AdvancedSiteSearchDataSource(proto.Enum): proto.STRING, number=7, ) - advanced_site_search_data_sources: MutableSequence[ - AdvancedSiteSearchDataSource - ] = proto.RepeatedField( - proto.ENUM, - number=10, - enum=AdvancedSiteSearchDataSource, + advanced_site_search_data_sources: MutableSequence[AdvancedSiteSearchDataSource] = ( + proto.RepeatedField( + proto.ENUM, + number=10, + enum=AdvancedSiteSearchDataSource, + ) ) schema_org_paths: MutableSequence[str] = proto.RepeatedField( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema_service.py index 1bcb7a03dc21..eaf63b13e3e0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/schema_service.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py index ec032e3f2105..ef880576fff2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_service.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import chunk as gcd_chunk from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.discoveryengine_v1alpha.types import document as gcd_document +from google.protobuf import struct_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -64,11 +65,11 @@ class SearchRequest(proto.Message): type. Values above the maximum value are coerced to the maximum value. - - Websites with basic indexing: Default ``10``, Maximum - ``25``. - - Websites with advanced indexing: Default ``25``, Maximum - ``50``. - - Other: Default ``50``, Maximum ``100``. + - Websites with basic indexing: Default ``10``, Maximum + ``25``. + - Websites with advanced indexing: Default ``25``, Maximum + ``50``. + - Other: Default ``50``, Maximum ``100``. If this field is negative, an ``INVALID_ARGUMENT`` is returned. @@ -180,18 +181,18 @@ class SearchRequest(proto.Message): For public website search only, supported values are: - - ``user_country_code``: string. Default empty. If set to - non-empty, results are restricted or boosted based on the - location provided. For example, - ``user_country_code: "au"`` + - ``user_country_code``: string. Default empty. If set to + non-empty, results are restricted or boosted based on the + location provided. For example, + ``user_country_code: "au"`` - For available codes see `Country - Codes `__ + For available codes see `Country + Codes `__ - - ``search_type``: double. Default empty. Enables - non-webpage searching depending on the value. The only - valid non-default value is 1, which enables image - searching. For example, ``search_type: 1`` + - ``search_type``: double. Default empty. Enables + non-webpage searching depending on the value. The only + valid non-default value is 1, which enables image + searching. For example, ``search_type: 1`` query_expansion_spec (google.cloud.discoveryengine_v1alpha.types.SearchRequest.QueryExpansionSpec): The query expansion specification that specifies the conditions under which query @@ -248,21 +249,21 @@ class SearchRequest(proto.Message): be a single function or multiple functions that are joined by "+". - - ranking_expression = function, { " + ", function }; + - ranking_expression = function, { " + ", function }; Supported functions: - - double \* relevance_score - - double \* dotProduct(embedding_field_path) + - double \* relevance_score + - double \* dotProduct(embedding_field_path) Function variables: - - ``relevance_score``: pre-defined keywords, used for - measure relevance between query and document. - - ``embedding_field_path``: the document embedding field - used with query embedding vector. - - ``dotProduct``: embedding function between - ``embedding_field_path`` and query embedding vector. + - ``relevance_score``: pre-defined keywords, used for + measure relevance between query and document. + - ``embedding_field_path``: the document embedding field + used with query embedding vector. + - ``dotProduct``: embedding function between + ``embedding_field_path`` and query embedding vector. Example ranking expression: @@ -276,66 +277,68 @@ class SearchRequest(proto.Message): is set to ``RANK_BY_FORMULA``, the following expression types (and combinations of those chained using + or - - operators) are supported: - - - ``double`` - - ``signal`` - - ``log(signal)`` - - ``exp(signal)`` - - ``rr(signal, double > 0)`` -- reciprocal rank - transformation with second argument being a denominator - constant. - - ``is_nan(signal)`` -- returns 0 if signal is NaN, 1 - otherwise. - - ``fill_nan(signal1, signal2 | double)`` -- if signal1 is - NaN, returns signal2 \| double, else returns signal1. - - Here are a few examples of ranking formulas that use the - supported ranking expression types: - - - ``0.2 * semantic_similarity_score + 0.8 * log(keyword_similarity_score)`` - -- mostly rank by the logarithm of - ``keyword_similarity_score`` with slight - ``semantic_smilarity_score`` adjustment. - - ``0.2 * exp(fill_nan(semantic_similarity_score, 0)) + 0.3 * is_nan(keyword_similarity_score)`` - -- rank by the exponent of ``semantic_similarity_score`` - filling the value with 0 if it's NaN, also add constant - 0.3 adjustment to the final score if - ``semantic_similarity_score`` is NaN. - - ``0.2 * rr(semantic_similarity_score, 16) + 0.8 * rr(keyword_similarity_score, 16)`` - -- mostly rank by the reciprocal rank of - ``keyword_similarity_score`` with slight adjustment of - reciprocal rank of ``semantic_smilarity_score``. + - operators) are supported: + + - ``double`` + - ``signal`` + - ``log(signal)`` + - ``exp(signal)`` + - ``rr(signal, double > 0)`` -- reciprocal rank + transformation with second argument being a + denominator constant. + - ``is_nan(signal)`` -- returns 0 if signal is NaN, 1 + otherwise. + - ``fill_nan(signal1, signal2 | double)`` -- if signal1 + is NaN, returns signal2 \| double, else returns + signal1. + + Here are a few examples of ranking formulas that use the + supported ranking expression types: + + - ``0.2 * semantic_similarity_score + 0.8 * log(keyword_similarity_score)`` + -- mostly rank by the logarithm of + ``keyword_similarity_score`` with slight + ``semantic_smilarity_score`` adjustment. + - ``0.2 * exp(fill_nan(semantic_similarity_score, 0)) + 0.3 * is_nan(keyword_similarity_score)`` + -- rank by the exponent of + ``semantic_similarity_score`` filling the value with 0 + if it's NaN, also add constant 0.3 adjustment to the + final score if ``semantic_similarity_score`` is NaN. + - ``0.2 * rr(semantic_similarity_score, 16) + 0.8 * rr(keyword_similarity_score, 16)`` + -- mostly rank by the reciprocal rank of + ``keyword_similarity_score`` with slight adjustment of + reciprocal rank of ``semantic_smilarity_score``. The following signals are supported: - - ``semantic_similarity_score``: semantic similarity - adjustment that is calculated using the embeddings - generated by a proprietary Google model. This score - determines how semantically similar a search query is to a - document. - - ``keyword_similarity_score``: keyword match adjustment - uses the Best Match 25 (BM25) ranking function. This score - is calculated using a probabilistic model to estimate the - probability that a document is relevant to a given query. - - ``relevance_score``: semantic relevance adjustment that - uses a proprietary Google model to determine the meaning - and intent behind a user's query in context with the - content in the documents. - - ``pctr_rank``: predicted conversion rate adjustment as a - rank use predicted Click-through rate (pCTR) to gauge the - relevance and attractiveness of a search result from a - user's perspective. A higher pCTR suggests that the result - is more likely to satisfy the user's query and intent, - making it a valuable signal for ranking. - - ``freshness_rank``: freshness adjustment as a rank - - ``document_age``: The time in hours elapsed since the - document was last updated, a floating-point number (e.g., - 0.25 means 15 minutes). - - ``topicality_rank``: topicality adjustment as a rank. Uses - proprietary Google model to determine the keyword-based - overlap between the query and the document. - - ``base_rank``: the default rank of the result + - ``semantic_similarity_score``: semantic similarity + adjustment that is calculated using the embeddings + generated by a proprietary Google model. This score + determines how semantically similar a search query is to + a document. + - ``keyword_similarity_score``: keyword match adjustment + uses the Best Match 25 (BM25) ranking function. This + score is calculated using a probabilistic model to + estimate the probability that a document is relevant to a + given query. + - ``relevance_score``: semantic relevance adjustment that + uses a proprietary Google model to determine the meaning + and intent behind a user's query in context with the + content in the documents. + - ``pctr_rank``: predicted conversion rate adjustment as a + rank use predicted Click-through rate (pCTR) to gauge the + relevance and attractiveness of a search result from a + user's perspective. A higher pCTR suggests that the + result is more likely to satisfy the user's query and + intent, making it a valuable signal for ranking. + - ``freshness_rank``: freshness adjustment as a rank + - ``document_age``: The time in hours elapsed since the + document was last updated, a floating-point number (e.g., + 0.25 means 15 minutes). + - ``topicality_rank``: topicality adjustment as a rank. + Uses proprietary Google model to determine the + keyword-based overlap between the query and the document. + - ``base_rank``: the default rank of the result ranking_expression_backend (google.cloud.discoveryengine_v1alpha.types.SearchRequest.RankingExpressionBackend): The backend to use for the ranking expression evaluation. @@ -346,20 +349,20 @@ class SearchRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -437,6 +440,7 @@ class RelevanceThreshold(proto.Enum): HIGH (4): High relevance threshold. """ + RELEVANCE_THRESHOLD_UNSPECIFIED = 0 LOWEST = 1 LOW = 2 @@ -456,6 +460,7 @@ class RankingExpressionBackend(proto.Enum): RANK_BY_FORMULA (4): Ranking by custom formula. """ + RANKING_EXPRESSION_BACKEND_UNSPECIFIED = 0 RANK_BY_EMBEDDING = 3 RANK_BY_FORMULA = 4 @@ -564,11 +569,11 @@ class FacetSpec(proto.Message): Another example, assuming you have the following facets in the request: - - "rating", enable_dynamic_position = true + - "rating", enable_dynamic_position = true - - "price", enable_dynamic_position = false + - "price", enable_dynamic_position = false - - "brands", enable_dynamic_position = false + - "brands", enable_dynamic_position = false And also you have a dynamic facets enabled, which generates a facet ``gender``. Then the final order of the facets in @@ -627,13 +632,13 @@ class FacetKey(proto.Message): Allowed values are: - - "count desc", which means order by - [SearchResponse.Facet.values.count][google.cloud.discoveryengine.v1alpha.SearchResponse.Facet.FacetValue.count] - descending. + - "count desc", which means order by + [SearchResponse.Facet.values.count][google.cloud.discoveryengine.v1alpha.SearchResponse.Facet.FacetValue.count] + descending. - - "value desc", which means order by - [SearchResponse.Facet.values.value][google.cloud.discoveryengine.v1alpha.SearchResponse.Facet.FacetValue.value] - descending. Only applies to textual facets. + - "value desc", which means order by + [SearchResponse.Facet.values.value][google.cloud.discoveryengine.v1alpha.SearchResponse.Facet.FacetValue.value] + descending. Only applies to textual facets. If not set, textual values are sorted in `natural order `__; @@ -715,9 +720,9 @@ class ConditionBoostSpec(proto.Message): Examples: - - To boost documents with document ID "doc_1" or "doc_2", - and color "Red" or "Blue": - ``(document_id: ANY("doc_1", "doc_2")) AND (color: ANY("Red", "Blue"))`` + - To boost documents with document ID "doc_1" or "doc_2", + and color "Red" or "Blue": + ``(document_id: ANY("doc_1", "doc_2")) AND (color: ANY("Red", "Blue"))`` boost (float): Strength of the condition boost, which should be in [-1, 1]. Negative boost means demotion. Default is 0.0. @@ -792,6 +797,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -808,6 +814,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -917,6 +924,7 @@ class Condition(proto.Enum): Automatic query expansion built by the Search API. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 AUTO = 2 @@ -960,6 +968,7 @@ class Mode(proto.Enum): Search API. Search will be based on the corrected query if found. """ + MODE_UNSPECIFIED = 0 SUGGESTION_ONLY = 1 AUTO = 2 @@ -1009,6 +1018,7 @@ class SearchResultMode(proto.Enum): [DataStore.DocumentProcessingConfig.chunking_config][] is specified. """ + SEARCH_RESULT_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -1162,15 +1172,15 @@ class ModelSpec(proto.Message): Supported values are: - - ``stable``: string. Default value when no value is - specified. Uses a generally available, fine-tuned model. - For more information, see `Answer generation model - versions and - lifecycle `__. - - ``preview``: string. (Public preview) Uses a preview - model. For more information, see `Answer generation model - versions and - lifecycle `__. + - ``stable``: string. Default value when no value is + specified. Uses a generally available, fine-tuned model. + For more information, see `Answer generation model + versions and + lifecycle `__. + - ``preview``: string. (Public preview) Uses a preview + model. For more information, see `Answer generation model + versions and + lifecycle `__. """ version: str = proto.Field( @@ -1419,6 +1429,7 @@ class FilterExtractionCondition(proto.Enum): ENABLED (2): Enables NL filter extraction. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1428,11 +1439,11 @@ class FilterExtractionCondition(proto.Enum): number=1, enum="SearchRequest.NaturalLanguageQueryUnderstandingSpec.FilterExtractionCondition", ) - geo_search_query_detection_field_names: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=2, + geo_search_query_detection_field_names: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=2, + ) ) class SearchAsYouTypeSpec(proto.Message): @@ -1458,6 +1469,7 @@ class Condition(proto.Enum): ENABLED (2): Enables Search As You Type. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1964,12 +1976,12 @@ class FacetValue(proto.Message): proto.STRING, number=1, ) - values: MutableSequence[ - "SearchResponse.Facet.FacetValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.Facet.FacetValue", + values: MutableSequence["SearchResponse.Facet.FacetValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.Facet.FacetValue", + ) ) dynamic_facet: bool = proto.Field( proto.BOOL, @@ -2102,6 +2114,7 @@ class SummarySkippedReason(proto.Enum): [SearchRequest.ContentSearchSpec.SummarySpec.ignore_non_answer_seeking_query] is set to ``true``. """ + SUMMARY_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_SUMMARY_SEEKING_QUERY_IGNORED = 2 @@ -2145,12 +2158,12 @@ class CitationMetadata(proto.Message): Citations for segments. """ - citations: MutableSequence[ - "SearchResponse.Summary.Citation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SearchResponse.Summary.Citation", + citations: MutableSequence["SearchResponse.Summary.Citation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SearchResponse.Summary.Citation", + ) ) class Citation(proto.Message): @@ -2174,12 +2187,12 @@ class Citation(proto.Message): proto.INT64, number=2, ) - sources: MutableSequence[ - "SearchResponse.Summary.CitationSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.CitationSource", + sources: MutableSequence["SearchResponse.Summary.CitationSource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.CitationSource", + ) ) class CitationSource(proto.Message): @@ -2277,12 +2290,12 @@ class SummaryWithMetadata(proto.Message): number=2, message="SearchResponse.Summary.CitationMetadata", ) - references: MutableSequence[ - "SearchResponse.Summary.Reference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.Reference", + references: MutableSequence["SearchResponse.Summary.Reference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.Reference", + ) ) summary_text: str = proto.Field( @@ -2451,6 +2464,7 @@ class Comparison(proto.Enum): GREATER_THAN (5): Denotes greater than ``>`` operator. """ + COMPARISON_UNSPECIFIED = 0 EQUALS = 1 LESS_THAN_EQUALS = 2 @@ -2694,6 +2708,7 @@ class OneBoxType(proto.Enum): SLACK (3): One Box result contains slack results. """ + ONE_BOX_TYPE_UNSPECIFIED = 0 PEOPLE = 1 ORGANIZATION = 2 @@ -2704,12 +2719,12 @@ class OneBoxType(proto.Enum): number=1, enum="SearchResponse.OneBoxResult.OneBoxType", ) - search_results: MutableSequence[ - "SearchResponse.SearchResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.SearchResult", + search_results: MutableSequence["SearchResponse.SearchResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.SearchResult", + ) ) @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py index 2134c54c126e..64ab9cc0c5f5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/search_tuning_service.py @@ -17,14 +17,13 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + +from google.cloud.discoveryengine_v1alpha.types import custom_tuning_model +from google.cloud.discoveryengine_v1alpha.types import import_config from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import ( - custom_tuning_model, - import_config, -) __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -68,12 +67,12 @@ class ListCustomModelsResponse(proto.Message): List of custom tuning models. """ - models: MutableSequence[ - custom_tuning_model.CustomTuningModel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_tuning_model.CustomTuningModel, + models: MutableSequence[custom_tuning_model.CustomTuningModel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_tuning_model.CustomTuningModel, + ) ) @@ -98,8 +97,8 @@ class TrainCustomModelRequest(proto.Message): model_type (str): Model to be trained. Supported values are: - - **search-tuning**: Fine tuning the search system based on - data provided. + - **search-tuning**: Fine tuning the search system based on + data provided. error_config (google.cloud.discoveryengine_v1alpha.types.ImportErrorConfig): The desired location of errors incurred during the data ingestion and training. @@ -139,8 +138,8 @@ class GcsTrainingInput(proto.Message): number in ``[0, inf+)``. The larger the number is, the more relevant the pair is. Example: - - ``query-id\tcorpus-id\tscore`` - - ``query1\tdoc1\t1`` + - ``query-id\tcorpus-id\tscore`` + - ``query1\tdoc1\t1`` test_data_path (str): Cloud Storage test data. Same format as train_data_path. If not provided, a random 80/20 train/test split will be @@ -205,15 +204,15 @@ class TrainCustomModelResponse(proto.Message): model_status (str): The trained model status. Possible values are: - - **bad-data**: The training data quality is bad. - - **no-improvement**: Tuning didn't improve performance. - Won't deploy. - - **in-progress**: Model training job creation is in - progress. - - **training**: Model is actively training. - - **evaluating**: The model is evaluating trained metrics. - - **indexing**: The model trained metrics are indexing. - - **ready**: The model is ready for serving. + - **bad-data**: The training data quality is bad. + - **no-improvement**: Tuning didn't improve performance. + Won't deploy. + - **in-progress**: Model training job creation is in + progress. + - **training**: Model is actively training. + - **evaluating**: The model is evaluating trained metrics. + - **indexing**: The model trained metrics are indexing. + - **ready**: The model is ready for serving. metrics (MutableMapping[str, float]): The metrics of the trained model. model_name (str): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config.py index b375e48b8ce0..4961cbc8c81c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config.py @@ -17,10 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1alpha.types import common, search_service +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import search_service +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -82,11 +84,11 @@ class ServingConfig(proto.Message): e.g. ``medium-diversity`` or ``high-diversity``. Currently supported values: - - ``no-diversity`` - - ``low-diversity`` - - ``medium-diversity`` - - ``high-diversity`` - - ``auto-diversity`` + - ``no-diversity`` + - ``low-diversity`` + - ``medium-diversity`` + - ``high-diversity`` + - ``auto-diversity`` If not specified, we choose default based on recommendation model type. Default value: ``no-diversity``. @@ -118,21 +120,21 @@ class ServingConfig(proto.Message): The ranking expression is a single function or multiple functions that are joined by "+". - - ranking_expression = function, { " + ", function }; + - ranking_expression = function, { " + ", function }; Supported functions: - - double \* relevance_score - - double \* dotProduct(embedding_field_path) + - double \* relevance_score + - double \* dotProduct(embedding_field_path) Function variables: - - ``relevance_score``: pre-defined keywords, used for - measure relevance between query and document. - - ``embedding_field_path``: the document embedding field - used with query embedding vector. - - ``dotProduct``: embedding function between - embedding_field_path and query embedding vector. + - ``relevance_score``: pre-defined keywords, used for + measure relevance between query and document. + - ``embedding_field_path``: the document embedding field + used with query embedding vector. + - ``dotProduct``: embedding function between + embedding_field_path and query embedding vector. Example ranking expression: @@ -221,20 +223,20 @@ class MediaConfig(proto.Message): r"""Specifies the configurations needed for Media Discovery. Currently we support: - - ``demote_content_watched``: Threshold for watched content - demotion. Customers can specify if using watched content demotion - or use viewed detail page. Using the content watched demotion, - customers need to specify the watched minutes or percentage - exceeds the threshold, the content will be demoted in the - recommendation result. - - ``promote_fresh_content``: cutoff days for fresh content - promotion. Customers can specify if using content freshness - promotion. If the content was published within the cutoff days, - the content will be promoted in the recommendation result. Can - only be set if - [SolutionType][google.cloud.discoveryengine.v1alpha.SolutionType] - is - [SOLUTION_TYPE_RECOMMENDATION][google.cloud.discoveryengine.v1alpha.SolutionType.SOLUTION_TYPE_RECOMMENDATION]. + - ``demote_content_watched``: Threshold for watched content + demotion. Customers can specify if using watched content demotion + or use viewed detail page. Using the content watched demotion, + customers need to specify the watched minutes or percentage + exceeds the threshold, the content will be demoted in the + recommendation result. + - ``promote_fresh_content``: cutoff days for fresh content + promotion. Customers can specify if using content freshness + promotion. If the content was published within the cutoff days, + the content will be promoted in the recommendation result. Can + only be set if + [SolutionType][google.cloud.discoveryengine.v1alpha.SolutionType] + is + [SOLUTION_TYPE_RECOMMENDATION][google.cloud.discoveryengine.v1alpha.SolutionType.SOLUTION_TYPE_RECOMMENDATION]. This message has `oneof`_ fields (mutually exclusive fields). For each oneof, at most one member field can be set at the same time. @@ -259,11 +261,11 @@ class MediaConfig(proto.Message): Specifies the event type used for demoting recommendation result. Currently supported values: - - ``view-item``: Item viewed. - - ``media-play``: Start/resume watching a video, playing a - song, etc. - - ``media-complete``: Finished or stopped midway through a - video, song, etc. + - ``view-item``: Item viewed. + - ``media-play``: Start/resume watching a video, playing a + song, etc. + - ``media-complete``: Finished or stopped midway through a + video, song, etc. If unset, watch history demotion will not be applied. Content freshness demotion will still be applied. @@ -297,7 +299,8 @@ class GenericConfig(proto.Message): r"""Specifies the configurations needed for Generic Discovery.Currently we support: - - ``content_search_spec``: configuration for generic content search. + - ``content_search_spec``: configuration for generic content + search. Attributes: content_search_spec (google.cloud.discoveryengine_v1alpha.types.SearchRequest.ContentSearchSpec): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py index 40b86435dce1..d473d94c9725 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/serving_config_service.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -46,7 +47,7 @@ class UpdateServingConfigRequest(proto.Message): [ServingConfig][google.cloud.discoveryengine.v1alpha.ServingConfig] to update. The following are NOT supported: - - [ServingConfig.name][google.cloud.discoveryengine.v1alpha.ServingConfig.name] + - [ServingConfig.name][google.cloud.discoveryengine.v1alpha.ServingConfig.name] If not set, all supported fields are updated. """ @@ -126,12 +127,12 @@ class ListServingConfigsResponse(proto.Message): def raw_page(self): return self - serving_configs: MutableSequence[ - gcd_serving_config.ServingConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_serving_config.ServingConfig, + serving_configs: MutableSequence[gcd_serving_config.ServingConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_serving_config.ServingConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py index a4ebfbde229b..bd9ad95af955 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import answer as gcd_answer from google.cloud.discoveryengine_v1alpha.types import common +from google.protobuf import duration_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -58,6 +59,7 @@ class FileSource(proto.Enum): The file was retrieved from a URL (e.g. public web). """ + FILE_SOURCE_UNSPECIFIED = 0 FILE_SOURCE_INLINE = 1 FILE_SOURCE_LOCAL = 2 @@ -104,6 +106,7 @@ class State(proto.Enum): IN_PROGRESS (1): The session is currently open. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 @@ -253,6 +256,7 @@ class ColorSpace(proto.Enum): OTHER_COLOR_SPACE (5): Other colorspace. """ + COLOR_SPACE_UNSPECIFIED = 0 RGB = 1 CMYK = 2 @@ -497,11 +501,11 @@ class FileMetadata(proto.Message): Output only. Alternate views of this file object. Each file view is attached to a specific role. Possible example keys: - - "thumbnail" - - "mobile_thumbnail" - - "clip" - - "summary" - - "translation". + - "thumbnail" + - "mobile_thumbnail" + - "clip" + - "summary" + - "translation". """ file_id: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session_service.py index 30f221be13d0..7322121ca532 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/session_service.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1alpha.types import session + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -46,17 +47,17 @@ class ListFilesRequest(proto.Message): fields of the files being filtered. Filter expression is case-sensitive. Currently supported field names are: - - upload_time - - last_add_time - - last_use_time - - file_name - - mime_type + - upload_time + - last_add_time + - last_use_time + - file_name + - mime_type Some examples of filters would be: - - "file_name = 'file_1'" - - "file_name = 'file_1' AND mime_type = 'text/plain'" - - "last_use_time > '2025-06-14T12:00:00Z'" + - "file_name = 'file_1'" + - "file_name = 'file_1' AND mime_type = 'text/plain'" + - "last_use_time > '2025-06-14T12:00:00Z'" For a full description of the filter format, please see https://google.aip.dev/160. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py index 166338513ae6..bd13db876ae3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ @@ -102,6 +104,7 @@ class Type(proto.Enum): EXCLUDE (2): Exclude the target site. """ + TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -129,6 +132,7 @@ class IndexingStatus(proto.Enum): 2. state reverts to SUCCEEDED if the unindexing fails. """ + INDEXING_STATUS_UNSPECIFIED = 0 PENDING = 1 FAILED = 2 @@ -243,6 +247,7 @@ class SiteVerificationState(proto.Enum): Site exempt from verification, e.g., a public website that opens to all. """ + SITE_VERIFICATION_STATE_UNSPECIFIED = 0 VERIFIED = 1 UNVERIFIED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py index a54f73fddbfc..1f666ce2fb97 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/site_search_engine_service.py @@ -17,13 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import ( site_search_engine as gcd_site_search_engine, ) +from google.protobuf import struct_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -371,12 +372,12 @@ class ListTargetSitesResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -424,12 +425,12 @@ class BatchCreateTargetSitesResponse(proto.Message): TargetSites created. """ - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) @@ -618,6 +619,7 @@ class CorpusType(proto.Enum): Denotes a crawling attempt for the mobile version of a page. """ + CORPUS_TYPE_UNSPECIFIED = 0 DESKTOP = 1 MOBILE = 2 @@ -837,12 +839,12 @@ class FetchDomainVerificationStatusResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event.py index 8b04f0b4a5ba..d16138af7904 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1alpha.types import common +from google.protobuf import duration_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", @@ -49,26 +50,26 @@ class UserEvent(proto.Message): Generic values: - - ``search``: Search for Documents. - - ``view-item``: Detailed page view of a Document. - - ``view-item-list``: View of a panel or ordered list of - Documents. - - ``view-home-page``: View of the home page. - - ``view-category-page``: View of a category page, e.g. Home - > Men > Jeans + - ``search``: Search for Documents. + - ``view-item``: Detailed page view of a Document. + - ``view-item-list``: View of a panel or ordered list of + Documents. + - ``view-home-page``: View of the home page. + - ``view-category-page``: View of a category page, e.g. + Home > Men > Jeans Retail-related values: - - ``add-to-cart``: Add an item(s) to cart, e.g. in Retail - online shopping - - ``purchase``: Purchase an item(s) + - ``add-to-cart``: Add an item(s) to cart, e.g. in Retail + online shopping + - ``purchase``: Purchase an item(s) Media-related values: - - ``media-play``: Start/resume watching a video, playing a - song, etc. - - ``media-complete``: Finished or stopped midway through a - video, song, etc. + - ``media-play``: Start/resume watching a video, playing a + song, etc. + - ``media-complete``: Finished or stopped midway through a + video, song, etc. user_pseudo_id (str): Required. A unique identifier for tracking visitors. @@ -158,12 +159,12 @@ class UserEvent(proto.Message): The value must be one of: - - [RecommendResponse.attribution_token][google.cloud.discoveryengine.v1alpha.RecommendResponse.attribution_token] - for events that are the result of - [RecommendationService.Recommend][google.cloud.discoveryengine.v1alpha.RecommendationService.Recommend]. - - [SearchResponse.attribution_token][google.cloud.discoveryengine.v1alpha.SearchResponse.attribution_token] - for events that are the result of - [SearchService.Search][google.cloud.discoveryengine.v1alpha.SearchService.Search]. + - [RecommendResponse.attribution_token][google.cloud.discoveryengine.v1alpha.RecommendResponse.attribution_token] + for events that are the result of + [RecommendationService.Recommend][google.cloud.discoveryengine.v1alpha.RecommendationService.Recommend]. + - [SearchResponse.attribution_token][google.cloud.discoveryengine.v1alpha.SearchResponse.attribution_token] + for events that are the result of + [SearchService.Search][google.cloud.discoveryengine.v1alpha.SearchService.Search]. This token enables us to accurately attribute page view or conversion completion back to the event and the particular @@ -203,11 +204,11 @@ class UserEvent(proto.Message): This field is optional except for the following event types: - - ``view-item`` - - ``add-to-cart`` - - ``purchase`` - - ``media-play`` - - ``media-complete`` + - ``view-item`` + - ``add-to-cart`` + - ``purchase`` + - ``media-play`` + - ``media-complete`` In a ``search`` event, this field represents the documents returned to the end user on the current page (the end user @@ -261,12 +262,12 @@ class UserEvent(proto.Message): This field needs to pass all below criteria, otherwise an ``INVALID_ARGUMENT`` error is returned: - - The key must be a UTF-8 encoded string with a length limit - of 5,000 characters. - - For text attributes, at most 400 values are allowed. Empty - values are not allowed. Each value must be a UTF-8 encoded - string with a length limit of 256 characters. - - For number attributes, at most 400 values are allowed. + - The key must be a UTF-8 encoded string with a length + limit of 5,000 characters. + - For text attributes, at most 400 values are allowed. + Empty values are not allowed. Each value must be a UTF-8 + encoded string with a length limit of 256 characters. + - For number attributes, at most 400 values are allowed. For product recommendations, an example of extra user information is ``traffic_channel``, which is how a user @@ -562,12 +563,12 @@ class TransactionInfo(proto.Message): manufacturing costs, shipping expenses not borne by the end user, or any other costs, such that: - - Profit = - [value][google.cloud.discoveryengine.v1alpha.TransactionInfo.value] - - - [tax][google.cloud.discoveryengine.v1alpha.TransactionInfo.tax] - - - [cost][google.cloud.discoveryengine.v1alpha.TransactionInfo.cost] + - Profit = + [value][google.cloud.discoveryengine.v1alpha.TransactionInfo.value] + - + [tax][google.cloud.discoveryengine.v1alpha.TransactionInfo.tax] + - + [cost][google.cloud.discoveryengine.v1alpha.TransactionInfo.cost] This field is a member of `oneof`_ ``_cost``. discount_value (float): @@ -589,12 +590,12 @@ class TransactionInfo(proto.Message): can be larger than [TransactionInfo.value][google.cloud.discoveryengine.v1alpha.TransactionInfo.value]: - - Profit = - [value][google.cloud.discoveryengine.v1alpha.TransactionInfo.value] - - - [tax][google.cloud.discoveryengine.v1alpha.TransactionInfo.tax] - - - [cost][google.cloud.discoveryengine.v1alpha.TransactionInfo.cost] + - Profit = + [value][google.cloud.discoveryengine.v1alpha.TransactionInfo.value] + - + [tax][google.cloud.discoveryengine.v1alpha.TransactionInfo.tax] + - + [cost][google.cloud.discoveryengine.v1alpha.TransactionInfo.cost] This field is a member of `oneof`_ ``_discount_value``. """ @@ -668,8 +669,8 @@ class DocumentInfo(proto.Message): Required for events of the following event types: - - ``add-to-cart`` - - ``purchase`` + - ``add-to-cart`` + - ``purchase`` This field is a member of `oneof`_ ``_quantity``. promotion_ids (MutableSequence[str]): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event_service.py index 41c480fb642d..89306e6bf37c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1alpha/types/user_event_service.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1alpha.types import user_event as gcd_user_event + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1alpha", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py index da0657e641bd..fa49772fb781 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/__init__.py @@ -18,326 +18,283 @@ __version__ = package_version.__version__ -from .services.completion_service import ( - CompletionServiceAsyncClient, - CompletionServiceClient, -) -from .services.control_service import ControlServiceAsyncClient, ControlServiceClient +from .services.completion_service import CompletionServiceClient +from .services.completion_service import CompletionServiceAsyncClient +from .services.control_service import ControlServiceClient +from .services.control_service import ControlServiceAsyncClient +from .services.conversational_search_service import ConversationalSearchServiceClient from .services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, - ConversationalSearchServiceClient, -) -from .services.data_store_service import ( - DataStoreServiceAsyncClient, - DataStoreServiceClient, -) -from .services.document_service import DocumentServiceAsyncClient, DocumentServiceClient -from .services.engine_service import EngineServiceAsyncClient, EngineServiceClient -from .services.evaluation_service import ( - EvaluationServiceAsyncClient, - EvaluationServiceClient, -) -from .services.grounded_generation_service import ( - GroundedGenerationServiceAsyncClient, - GroundedGenerationServiceClient, -) -from .services.project_service import ProjectServiceAsyncClient, ProjectServiceClient -from .services.rank_service import RankServiceAsyncClient, RankServiceClient -from .services.recommendation_service import ( - RecommendationServiceAsyncClient, - RecommendationServiceClient, -) -from .services.sample_query_service import ( - SampleQueryServiceAsyncClient, - SampleQueryServiceClient, -) -from .services.sample_query_set_service import ( - SampleQuerySetServiceAsyncClient, - SampleQuerySetServiceClient, -) -from .services.schema_service import SchemaServiceAsyncClient, SchemaServiceClient -from .services.search_service import SearchServiceAsyncClient, SearchServiceClient -from .services.search_tuning_service import ( - SearchTuningServiceAsyncClient, - SearchTuningServiceClient, -) -from .services.serving_config_service import ( - ServingConfigServiceAsyncClient, - ServingConfigServiceClient, -) -from .services.session_service import SessionServiceAsyncClient, SessionServiceClient -from .services.site_search_engine_service import ( - SiteSearchEngineServiceAsyncClient, - SiteSearchEngineServiceClient, -) -from .services.user_event_service import ( - UserEventServiceAsyncClient, - UserEventServiceClient, ) +from .services.data_store_service import DataStoreServiceClient +from .services.data_store_service import DataStoreServiceAsyncClient +from .services.document_service import DocumentServiceClient +from .services.document_service import DocumentServiceAsyncClient +from .services.engine_service import EngineServiceClient +from .services.engine_service import EngineServiceAsyncClient +from .services.evaluation_service import EvaluationServiceClient +from .services.evaluation_service import EvaluationServiceAsyncClient +from .services.grounded_generation_service import GroundedGenerationServiceClient +from .services.grounded_generation_service import GroundedGenerationServiceAsyncClient +from .services.project_service import ProjectServiceClient +from .services.project_service import ProjectServiceAsyncClient +from .services.rank_service import RankServiceClient +from .services.rank_service import RankServiceAsyncClient +from .services.recommendation_service import RecommendationServiceClient +from .services.recommendation_service import RecommendationServiceAsyncClient +from .services.sample_query_service import SampleQueryServiceClient +from .services.sample_query_service import SampleQueryServiceAsyncClient +from .services.sample_query_set_service import SampleQuerySetServiceClient +from .services.sample_query_set_service import SampleQuerySetServiceAsyncClient +from .services.schema_service import SchemaServiceClient +from .services.schema_service import SchemaServiceAsyncClient +from .services.search_service import SearchServiceClient +from .services.search_service import SearchServiceAsyncClient +from .services.search_tuning_service import SearchTuningServiceClient +from .services.search_tuning_service import SearchTuningServiceAsyncClient +from .services.serving_config_service import ServingConfigServiceClient +from .services.serving_config_service import ServingConfigServiceAsyncClient +from .services.session_service import SessionServiceClient +from .services.session_service import SessionServiceAsyncClient +from .services.site_search_engine_service import SiteSearchEngineServiceClient +from .services.site_search_engine_service import SiteSearchEngineServiceAsyncClient +from .services.user_event_service import UserEventServiceClient +from .services.user_event_service import UserEventServiceAsyncClient + from .types.answer import Answer from .types.chunk import Chunk -from .types.common import ( - CustomAttribute, - DoubleList, - EmbeddingConfig, - IndustryVertical, - Interval, - SearchAddOn, - SearchTier, - SearchUseCase, - SolutionType, - UserInfo, -) -from .types.completion import CompletionSuggestion, SuggestionDenyListEntry -from .types.completion_service import ( - AdvancedCompleteQueryRequest, - AdvancedCompleteQueryResponse, - CompleteQueryRequest, - CompleteQueryResponse, -) -from .types.control import Condition, Control -from .types.control_service import ( - CreateControlRequest, - DeleteControlRequest, - GetControlRequest, - ListControlsRequest, - ListControlsResponse, - UpdateControlRequest, -) -from .types.conversation import ( - Conversation, - ConversationContext, - ConversationMessage, - Reply, - TextInput, -) -from .types.conversational_search_service import ( - AnswerQueryRequest, - AnswerQueryResponse, - ConverseConversationRequest, - ConverseConversationResponse, - CreateConversationRequest, - CreateSessionRequest, - DeleteConversationRequest, - DeleteSessionRequest, - GetAnswerRequest, - GetConversationRequest, - GetSessionRequest, - ListConversationsRequest, - ListConversationsResponse, - ListSessionsRequest, - ListSessionsResponse, - UpdateConversationRequest, - UpdateSessionRequest, -) +from .types.common import CustomAttribute +from .types.common import DoubleList +from .types.common import EmbeddingConfig +from .types.common import Interval +from .types.common import UserInfo +from .types.common import IndustryVertical +from .types.common import SearchAddOn +from .types.common import SearchTier +from .types.common import SearchUseCase +from .types.common import SolutionType +from .types.completion import CompletionSuggestion +from .types.completion import SuggestionDenyListEntry +from .types.completion_service import AdvancedCompleteQueryRequest +from .types.completion_service import AdvancedCompleteQueryResponse +from .types.completion_service import CompleteQueryRequest +from .types.completion_service import CompleteQueryResponse +from .types.control import Condition +from .types.control import Control +from .types.control_service import CreateControlRequest +from .types.control_service import DeleteControlRequest +from .types.control_service import GetControlRequest +from .types.control_service import ListControlsRequest +from .types.control_service import ListControlsResponse +from .types.control_service import UpdateControlRequest +from .types.conversation import Conversation +from .types.conversation import ConversationContext +from .types.conversation import ConversationMessage +from .types.conversation import Reply +from .types.conversation import TextInput +from .types.conversational_search_service import AnswerQueryRequest +from .types.conversational_search_service import AnswerQueryResponse +from .types.conversational_search_service import ConverseConversationRequest +from .types.conversational_search_service import ConverseConversationResponse +from .types.conversational_search_service import CreateConversationRequest +from .types.conversational_search_service import CreateSessionRequest +from .types.conversational_search_service import DeleteConversationRequest +from .types.conversational_search_service import DeleteSessionRequest +from .types.conversational_search_service import GetAnswerRequest +from .types.conversational_search_service import GetConversationRequest +from .types.conversational_search_service import GetSessionRequest +from .types.conversational_search_service import ListConversationsRequest +from .types.conversational_search_service import ListConversationsResponse +from .types.conversational_search_service import ListSessionsRequest +from .types.conversational_search_service import ListSessionsResponse +from .types.conversational_search_service import UpdateConversationRequest +from .types.conversational_search_service import UpdateSessionRequest from .types.custom_tuning_model import CustomTuningModel -from .types.data_store import ( - DataStore, - LanguageInfo, - NaturalLanguageQueryUnderstandingConfig, - WorkspaceConfig, -) -from .types.data_store_service import ( - CreateDataStoreMetadata, - CreateDataStoreRequest, - DeleteDataStoreMetadata, - DeleteDataStoreRequest, - GetDataStoreRequest, - ListDataStoresRequest, - ListDataStoresResponse, - UpdateDataStoreRequest, -) +from .types.data_store import DataStore +from .types.data_store import LanguageInfo +from .types.data_store import NaturalLanguageQueryUnderstandingConfig +from .types.data_store import WorkspaceConfig +from .types.data_store_service import CreateDataStoreMetadata +from .types.data_store_service import CreateDataStoreRequest +from .types.data_store_service import DeleteDataStoreMetadata +from .types.data_store_service import DeleteDataStoreRequest +from .types.data_store_service import GetDataStoreRequest +from .types.data_store_service import ListDataStoresRequest +from .types.data_store_service import ListDataStoresResponse +from .types.data_store_service import UpdateDataStoreRequest from .types.document import Document from .types.document_processing_config import DocumentProcessingConfig -from .types.document_service import ( - BatchGetDocumentsMetadataRequest, - BatchGetDocumentsMetadataResponse, - CreateDocumentRequest, - DeleteDocumentRequest, - GetDocumentRequest, - ListDocumentsRequest, - ListDocumentsResponse, - UpdateDocumentRequest, -) +from .types.document_service import BatchGetDocumentsMetadataRequest +from .types.document_service import BatchGetDocumentsMetadataResponse +from .types.document_service import CreateDocumentRequest +from .types.document_service import DeleteDocumentRequest +from .types.document_service import GetDocumentRequest +from .types.document_service import ListDocumentsRequest +from .types.document_service import ListDocumentsResponse +from .types.document_service import UpdateDocumentRequest from .types.engine import Engine -from .types.engine_service import ( - CreateEngineMetadata, - CreateEngineRequest, - DeleteEngineMetadata, - DeleteEngineRequest, - GetEngineRequest, - ListEnginesRequest, - ListEnginesResponse, - PauseEngineRequest, - ResumeEngineRequest, - TuneEngineMetadata, - TuneEngineRequest, - TuneEngineResponse, - UpdateEngineRequest, -) -from .types.evaluation import Evaluation, QualityMetrics -from .types.evaluation_service import ( - CreateEvaluationMetadata, - CreateEvaluationRequest, - GetEvaluationRequest, - ListEvaluationResultsRequest, - ListEvaluationResultsResponse, - ListEvaluationsRequest, - ListEvaluationsResponse, -) -from .types.grounded_generation_service import ( - CheckGroundingRequest, - CheckGroundingResponse, - CheckGroundingSpec, - GenerateGroundedContentRequest, - GenerateGroundedContentResponse, - GroundedGenerationContent, -) -from .types.grounding import FactChunk, GroundingConfig, GroundingFact -from .types.import_config import ( - AlloyDbSource, - BigQuerySource, - BigtableOptions, - BigtableSource, - CloudSqlSource, - FhirStoreSource, - FirestoreSource, - GcsSource, - ImportCompletionSuggestionsMetadata, - ImportCompletionSuggestionsRequest, - ImportCompletionSuggestionsResponse, - ImportDocumentsMetadata, - ImportDocumentsRequest, - ImportDocumentsResponse, - ImportErrorConfig, - ImportSampleQueriesMetadata, - ImportSampleQueriesRequest, - ImportSampleQueriesResponse, - ImportSuggestionDenyListEntriesMetadata, - ImportSuggestionDenyListEntriesRequest, - ImportSuggestionDenyListEntriesResponse, - ImportUserEventsMetadata, - ImportUserEventsRequest, - ImportUserEventsResponse, - SpannerSource, -) +from .types.engine_service import CreateEngineMetadata +from .types.engine_service import CreateEngineRequest +from .types.engine_service import DeleteEngineMetadata +from .types.engine_service import DeleteEngineRequest +from .types.engine_service import GetEngineRequest +from .types.engine_service import ListEnginesRequest +from .types.engine_service import ListEnginesResponse +from .types.engine_service import PauseEngineRequest +from .types.engine_service import ResumeEngineRequest +from .types.engine_service import TuneEngineMetadata +from .types.engine_service import TuneEngineRequest +from .types.engine_service import TuneEngineResponse +from .types.engine_service import UpdateEngineRequest +from .types.evaluation import Evaluation +from .types.evaluation import QualityMetrics +from .types.evaluation_service import CreateEvaluationMetadata +from .types.evaluation_service import CreateEvaluationRequest +from .types.evaluation_service import GetEvaluationRequest +from .types.evaluation_service import ListEvaluationResultsRequest +from .types.evaluation_service import ListEvaluationResultsResponse +from .types.evaluation_service import ListEvaluationsRequest +from .types.evaluation_service import ListEvaluationsResponse +from .types.grounded_generation_service import CheckGroundingRequest +from .types.grounded_generation_service import CheckGroundingResponse +from .types.grounded_generation_service import CheckGroundingSpec +from .types.grounded_generation_service import GenerateGroundedContentRequest +from .types.grounded_generation_service import GenerateGroundedContentResponse +from .types.grounded_generation_service import GroundedGenerationContent +from .types.grounding import FactChunk +from .types.grounding import GroundingConfig +from .types.grounding import GroundingFact +from .types.import_config import AlloyDbSource +from .types.import_config import BigQuerySource +from .types.import_config import BigtableOptions +from .types.import_config import BigtableSource +from .types.import_config import CloudSqlSource +from .types.import_config import FhirStoreSource +from .types.import_config import FirestoreSource +from .types.import_config import GcsSource +from .types.import_config import ImportCompletionSuggestionsMetadata +from .types.import_config import ImportCompletionSuggestionsRequest +from .types.import_config import ImportCompletionSuggestionsResponse +from .types.import_config import ImportDocumentsMetadata +from .types.import_config import ImportDocumentsRequest +from .types.import_config import ImportDocumentsResponse +from .types.import_config import ImportErrorConfig +from .types.import_config import ImportSampleQueriesMetadata +from .types.import_config import ImportSampleQueriesRequest +from .types.import_config import ImportSampleQueriesResponse +from .types.import_config import ImportSuggestionDenyListEntriesMetadata +from .types.import_config import ImportSuggestionDenyListEntriesRequest +from .types.import_config import ImportSuggestionDenyListEntriesResponse +from .types.import_config import ImportUserEventsMetadata +from .types.import_config import ImportUserEventsRequest +from .types.import_config import ImportUserEventsResponse +from .types.import_config import SpannerSource from .types.project import Project -from .types.project_service import ProvisionProjectMetadata, ProvisionProjectRequest -from .types.purge_config import ( - PurgeCompletionSuggestionsMetadata, - PurgeCompletionSuggestionsRequest, - PurgeCompletionSuggestionsResponse, - PurgeDocumentsMetadata, - PurgeDocumentsRequest, - PurgeDocumentsResponse, - PurgeErrorConfig, - PurgeSuggestionDenyListEntriesMetadata, - PurgeSuggestionDenyListEntriesRequest, - PurgeSuggestionDenyListEntriesResponse, - PurgeUserEventsMetadata, - PurgeUserEventsRequest, - PurgeUserEventsResponse, -) -from .types.rank_service import RankingRecord, RankRequest, RankResponse -from .types.recommendation_service import RecommendRequest, RecommendResponse +from .types.project_service import ProvisionProjectMetadata +from .types.project_service import ProvisionProjectRequest +from .types.purge_config import PurgeCompletionSuggestionsMetadata +from .types.purge_config import PurgeCompletionSuggestionsRequest +from .types.purge_config import PurgeCompletionSuggestionsResponse +from .types.purge_config import PurgeDocumentsMetadata +from .types.purge_config import PurgeDocumentsRequest +from .types.purge_config import PurgeDocumentsResponse +from .types.purge_config import PurgeErrorConfig +from .types.purge_config import PurgeSuggestionDenyListEntriesMetadata +from .types.purge_config import PurgeSuggestionDenyListEntriesRequest +from .types.purge_config import PurgeSuggestionDenyListEntriesResponse +from .types.purge_config import PurgeUserEventsMetadata +from .types.purge_config import PurgeUserEventsRequest +from .types.purge_config import PurgeUserEventsResponse +from .types.rank_service import RankingRecord +from .types.rank_service import RankRequest +from .types.rank_service import RankResponse +from .types.recommendation_service import RecommendRequest +from .types.recommendation_service import RecommendResponse from .types.sample_query import SampleQuery -from .types.sample_query_service import ( - CreateSampleQueryRequest, - DeleteSampleQueryRequest, - GetSampleQueryRequest, - ListSampleQueriesRequest, - ListSampleQueriesResponse, - UpdateSampleQueryRequest, -) +from .types.sample_query_service import CreateSampleQueryRequest +from .types.sample_query_service import DeleteSampleQueryRequest +from .types.sample_query_service import GetSampleQueryRequest +from .types.sample_query_service import ListSampleQueriesRequest +from .types.sample_query_service import ListSampleQueriesResponse +from .types.sample_query_service import UpdateSampleQueryRequest from .types.sample_query_set import SampleQuerySet -from .types.sample_query_set_service import ( - CreateSampleQuerySetRequest, - DeleteSampleQuerySetRequest, - GetSampleQuerySetRequest, - ListSampleQuerySetsRequest, - ListSampleQuerySetsResponse, - UpdateSampleQuerySetRequest, -) +from .types.sample_query_set_service import CreateSampleQuerySetRequest +from .types.sample_query_set_service import DeleteSampleQuerySetRequest +from .types.sample_query_set_service import GetSampleQuerySetRequest +from .types.sample_query_set_service import ListSampleQuerySetsRequest +from .types.sample_query_set_service import ListSampleQuerySetsResponse +from .types.sample_query_set_service import UpdateSampleQuerySetRequest from .types.schema import Schema -from .types.schema_service import ( - CreateSchemaMetadata, - CreateSchemaRequest, - DeleteSchemaMetadata, - DeleteSchemaRequest, - GetSchemaRequest, - ListSchemasRequest, - ListSchemasResponse, - UpdateSchemaMetadata, - UpdateSchemaRequest, -) -from .types.search_service import SearchRequest, SearchResponse -from .types.search_tuning_service import ( - ListCustomModelsRequest, - ListCustomModelsResponse, - TrainCustomModelMetadata, - TrainCustomModelRequest, - TrainCustomModelResponse, -) +from .types.schema_service import CreateSchemaMetadata +from .types.schema_service import CreateSchemaRequest +from .types.schema_service import DeleteSchemaMetadata +from .types.schema_service import DeleteSchemaRequest +from .types.schema_service import GetSchemaRequest +from .types.schema_service import ListSchemasRequest +from .types.schema_service import ListSchemasResponse +from .types.schema_service import UpdateSchemaMetadata +from .types.schema_service import UpdateSchemaRequest +from .types.search_service import SearchRequest +from .types.search_service import SearchResponse +from .types.search_tuning_service import ListCustomModelsRequest +from .types.search_tuning_service import ListCustomModelsResponse +from .types.search_tuning_service import TrainCustomModelMetadata +from .types.search_tuning_service import TrainCustomModelRequest +from .types.search_tuning_service import TrainCustomModelResponse from .types.serving_config import ServingConfig -from .types.serving_config_service import ( - GetServingConfigRequest, - ListServingConfigsRequest, - ListServingConfigsResponse, - UpdateServingConfigRequest, -) -from .types.session import Query, Session -from .types.site_search_engine import ( - Sitemap, - SiteSearchEngine, - SiteVerificationInfo, - TargetSite, -) -from .types.site_search_engine_service import ( - BatchCreateTargetSiteMetadata, - BatchCreateTargetSitesRequest, - BatchCreateTargetSitesResponse, - BatchVerifyTargetSitesMetadata, - BatchVerifyTargetSitesRequest, - BatchVerifyTargetSitesResponse, - CreateSitemapMetadata, - CreateSitemapRequest, - CreateTargetSiteMetadata, - CreateTargetSiteRequest, - DeleteSitemapMetadata, - DeleteSitemapRequest, - DeleteTargetSiteMetadata, - DeleteTargetSiteRequest, - DisableAdvancedSiteSearchMetadata, - DisableAdvancedSiteSearchRequest, - DisableAdvancedSiteSearchResponse, - EnableAdvancedSiteSearchMetadata, - EnableAdvancedSiteSearchRequest, - EnableAdvancedSiteSearchResponse, - FetchDomainVerificationStatusRequest, - FetchDomainVerificationStatusResponse, - FetchSitemapsRequest, - FetchSitemapsResponse, - GetSiteSearchEngineRequest, - GetTargetSiteRequest, - ListTargetSitesRequest, - ListTargetSitesResponse, - RecrawlUrisMetadata, - RecrawlUrisRequest, - RecrawlUrisResponse, - UpdateTargetSiteMetadata, - UpdateTargetSiteRequest, -) -from .types.user_event import ( - CompletionInfo, - DocumentInfo, - MediaInfo, - PageInfo, - PanelInfo, - SearchInfo, - TransactionInfo, - UserEvent, -) -from .types.user_event_service import CollectUserEventRequest, WriteUserEventRequest +from .types.serving_config_service import GetServingConfigRequest +from .types.serving_config_service import ListServingConfigsRequest +from .types.serving_config_service import ListServingConfigsResponse +from .types.serving_config_service import UpdateServingConfigRequest +from .types.session import Query +from .types.session import Session +from .types.site_search_engine import Sitemap +from .types.site_search_engine import SiteSearchEngine +from .types.site_search_engine import SiteVerificationInfo +from .types.site_search_engine import TargetSite +from .types.site_search_engine_service import BatchCreateTargetSiteMetadata +from .types.site_search_engine_service import BatchCreateTargetSitesRequest +from .types.site_search_engine_service import BatchCreateTargetSitesResponse +from .types.site_search_engine_service import BatchVerifyTargetSitesMetadata +from .types.site_search_engine_service import BatchVerifyTargetSitesRequest +from .types.site_search_engine_service import BatchVerifyTargetSitesResponse +from .types.site_search_engine_service import CreateSitemapMetadata +from .types.site_search_engine_service import CreateSitemapRequest +from .types.site_search_engine_service import CreateTargetSiteMetadata +from .types.site_search_engine_service import CreateTargetSiteRequest +from .types.site_search_engine_service import DeleteSitemapMetadata +from .types.site_search_engine_service import DeleteSitemapRequest +from .types.site_search_engine_service import DeleteTargetSiteMetadata +from .types.site_search_engine_service import DeleteTargetSiteRequest +from .types.site_search_engine_service import DisableAdvancedSiteSearchMetadata +from .types.site_search_engine_service import DisableAdvancedSiteSearchRequest +from .types.site_search_engine_service import DisableAdvancedSiteSearchResponse +from .types.site_search_engine_service import EnableAdvancedSiteSearchMetadata +from .types.site_search_engine_service import EnableAdvancedSiteSearchRequest +from .types.site_search_engine_service import EnableAdvancedSiteSearchResponse +from .types.site_search_engine_service import FetchDomainVerificationStatusRequest +from .types.site_search_engine_service import FetchDomainVerificationStatusResponse +from .types.site_search_engine_service import FetchSitemapsRequest +from .types.site_search_engine_service import FetchSitemapsResponse +from .types.site_search_engine_service import GetSiteSearchEngineRequest +from .types.site_search_engine_service import GetTargetSiteRequest +from .types.site_search_engine_service import ListTargetSitesRequest +from .types.site_search_engine_service import ListTargetSitesResponse +from .types.site_search_engine_service import RecrawlUrisMetadata +from .types.site_search_engine_service import RecrawlUrisRequest +from .types.site_search_engine_service import RecrawlUrisResponse +from .types.site_search_engine_service import UpdateTargetSiteMetadata +from .types.site_search_engine_service import UpdateTargetSiteRequest +from .types.user_event import CompletionInfo +from .types.user_event import DocumentInfo +from .types.user_event import MediaInfo +from .types.user_event import PageInfo +from .types.user_event import PanelInfo +from .types.user_event import SearchInfo +from .types.user_event import TransactionInfo +from .types.user_event import UserEvent +from .types.user_event_service import CollectUserEventRequest +from .types.user_event_service import WriteUserEventRequest __all__ = ( "CompletionServiceAsyncClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/gapic_version.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/gapic_version.py index 6b356a66811e..fd79d4e761b7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/gapic_version.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "0.15.0" # {x-release-please-version} +__version__ = "0.4.0" # {x-release-please-version} diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/__init__.py index 58eb7a9f0042..480b61be40da 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import CompletionServiceAsyncClient from .client import CompletionServiceClient +from .async_client import CompletionServiceAsyncClient __all__ = ( "CompletionServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py index 696b788ee215..6938dced37b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,18 +47,14 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.types import completion_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import ( - completion_service, - import_config, - purge_config, -) - -from .client import CompletionServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from .transports.base import CompletionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import CompletionServiceGrpcAsyncIOTransport +from .client import CompletionServiceClient try: from google.api_core import client_logging # type: ignore @@ -129,7 +126,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_info.__func__(CompletionServiceAsyncClient, info, *args, **kwargs) # type: ignore + return CompletionServiceClient.from_service_account_info.__func__( + CompletionServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -145,7 +144,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: CompletionServiceAsyncClient: The constructed client. """ - return CompletionServiceClient.from_service_account_file.__func__(CompletionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return CompletionServiceClient.from_service_account_file.__func__( + CompletionServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py index a586e8d99e41..37a908b48809 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,16 +63,12 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.types import completion_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import ( - completion_service, - import_config, - purge_config, -) - -from .transports.base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from .transports.base import CompletionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import CompletionServiceGrpcTransport from .transports.grpc_asyncio import CompletionServiceGrpcAsyncIOTransport from .transports.rest import CompletionServiceRestTransport @@ -86,9 +82,7 @@ class CompletionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[CompletionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] _transport_registry["grpc"] = CompletionServiceGrpcTransport _transport_registry["grpc_asyncio"] = CompletionServiceGrpcAsyncIOTransport _transport_registry["rest"] = CompletionServiceRestTransport @@ -662,11 +656,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = CompletionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + CompletionServiceClient._read_environment_variables() + ) self._client_cert_source = CompletionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -701,8 +693,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(CompletionServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/__init__.py index 20f1ed5f3637..7177c73e997f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import CompletionServiceTransport from .grpc import CompletionServiceGrpcTransport from .grpc_asyncio import CompletionServiceGrpcAsyncIOTransport -from .rest import CompletionServiceRestInterceptor, CompletionServiceRestTransport +from .rest import CompletionServiceRestTransport +from .rest import CompletionServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[CompletionServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py index 35762aa97803..1fdbec313e2e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/base.py @@ -16,23 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import ( - completion_service, - import_config, - purge_config, -) +from google.cloud.discoveryengine_v1beta.types import completion_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -284,7 +284,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py index 6ba36c174ca5..7edeb2be5b30 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc.py @@ -16,27 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - completion_service, - import_config, - purge_config, -) - -from .base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from google.cloud.discoveryengine_v1beta.types import completion_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import CompletionServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -428,12 +428,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -461,12 +461,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -493,12 +493,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -525,12 +525,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py index 026a65da5aa3..eb0e18bb812d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/grpc_asyncio.py @@ -15,31 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - completion_service, - import_config, - purge_config, -) - -from .base import DEFAULT_CLIENT_INFO, CompletionServiceTransport +from google.cloud.discoveryengine_v1beta.types import completion_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import CompletionServiceTransport, DEFAULT_CLIENT_INFO from .grpc import CompletionServiceGrpcTransport try: @@ -437,12 +437,12 @@ def import_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "import_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", - request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportSuggestionDenyListEntries", + request_serializer=import_config.ImportSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_suggestion_deny_list_entries"] @@ -471,12 +471,12 @@ def purge_suggestion_deny_list_entries( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_suggestion_deny_list_entries" not in self._stubs: - self._stubs[ - "purge_suggestion_deny_list_entries" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", - request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_suggestion_deny_list_entries"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeSuggestionDenyListEntries", + request_serializer=purge_config.PurgeSuggestionDenyListEntriesRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_suggestion_deny_list_entries"] @@ -504,12 +504,12 @@ def import_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "import_completion_suggestions" not in self._stubs: - self._stubs[ - "import_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", - request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["import_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/ImportCompletionSuggestions", + request_serializer=import_config.ImportCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["import_completion_suggestions"] @@ -537,12 +537,12 @@ def purge_completion_suggestions( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "purge_completion_suggestions" not in self._stubs: - self._stubs[ - "purge_completion_suggestions" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", - request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["purge_completion_suggestions"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.CompletionService/PurgeCompletionSuggestions", + request_serializer=purge_config.PurgeCompletionSuggestionsRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["purge_completion_suggestions"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py index 595318f8a1df..27068752fa95 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest.py @@ -13,31 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1beta.types import completion_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - completion_service, - import_config, - purge_config, -) -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseCompletionServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -818,9 +823,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseAdvancedCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseAdvancedCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_advanced_complete_query( request, metadata @@ -981,9 +984,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_http_options() request, metadata = self._interceptor.pre_complete_query(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseCompleteQuery._get_transcoded_request( @@ -1135,9 +1136,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_import_completion_suggestions( request, metadata @@ -1204,11 +1203,10 @@ def __call__( resp = self._interceptor.post_import_completion_suggestions(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_completion_suggestions_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_completion_suggestions_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1297,15 +1295,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_import_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_import_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BaseImportSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1369,11 +1364,10 @@ def __call__( resp = self._interceptor.post_import_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_import_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1460,9 +1454,7 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeCompletionSuggestions._get_http_options() request, metadata = self._interceptor.pre_purge_completion_suggestions( request, metadata @@ -1617,15 +1609,12 @@ def __call__( """ - http_options = ( - _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_http_options() - ( - request, - metadata, - ) = self._interceptor.pre_purge_suggestion_deny_list_entries( - request, metadata + request, metadata = ( + self._interceptor.pre_purge_suggestion_deny_list_entries( + request, metadata + ) ) transcoded_request = _BaseCompletionServiceRestTransport._BasePurgeSuggestionDenyListEntries._get_transcoded_request( http_options, request @@ -1689,11 +1678,10 @@ def __call__( resp = self._interceptor.post_purge_suggestion_deny_list_entries(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_purge_suggestion_deny_list_entries_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -1748,7 +1736,9 @@ def import_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._ImportCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def import_suggestion_deny_list_entries( @@ -1758,7 +1748,9 @@ def import_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._ImportSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._ImportSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_completion_suggestions( @@ -1768,7 +1760,9 @@ def purge_completion_suggestions( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeCompletionSuggestions(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeCompletionSuggestions( + self._session, self._host, self._interceptor + ) # type: ignore @property def purge_suggestion_deny_list_entries( @@ -1778,7 +1772,9 @@ def purge_suggestion_deny_list_entries( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._PurgeSuggestionDenyListEntries(self._session, self._host, self._interceptor) # type: ignore + return self._PurgeSuggestionDenyListEntries( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -1836,9 +1832,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1958,9 +1952,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -2099,9 +2091,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseCompletionServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseCompletionServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest_base.py index 91542092377e..68b3fe6f8d41 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/completion_service/transports/rest_base.py @@ -14,21 +14,21 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import CompletionServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1beta.types import ( - completion_service, - import_config, - purge_config, -) +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, CompletionServiceTransport + +from google.cloud.discoveryengine_v1beta.types import completion_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.longrunning import operations_pb2 # type: ignore class _BaseCompletionServiceRestTransport(CompletionServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/__init__.py index d5bd8f14f952..b0aec3b84b78 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ControlServiceAsyncClient from .client import ControlServiceClient +from .async_client import ControlServiceAsyncClient __all__ = ( "ControlServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py index 3888df9f0ba6..96cf45148cf9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,34 +29,33 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.control_service import pagers from google.cloud.discoveryengine_v1beta.types import common from google.cloud.discoveryengine_v1beta.types import control from google.cloud.discoveryengine_v1beta.types import control as gcd_control from google.cloud.discoveryengine_v1beta.types import control_service - -from .client import ControlServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from .transports.base import ControlServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ControlServiceGrpcAsyncIOTransport +from .client import ControlServiceClient try: from google.api_core import client_logging # type: ignore @@ -126,7 +125,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_info.__func__(ControlServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ControlServiceClient.from_service_account_info.__func__( + ControlServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ControlServiceAsyncClient: The constructed client. """ - return ControlServiceClient.from_service_account_file.__func__(ControlServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ControlServiceClient.from_service_account_file.__func__( + ControlServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -617,8 +620,8 @@ async def sample_update_control(): [Control][google.cloud.discoveryengine.v1beta.Control] to update. The following are NOT supported: - - [Control.name][google.cloud.discoveryengine.v1beta.Control.name] - - [Control.solution_type][google.cloud.discoveryengine.v1beta.Control.solution_type] + - [Control.name][google.cloud.discoveryengine.v1beta.Control.name] + - [Control.solution_type][google.cloud.discoveryengine.v1beta.Control.solution_type] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py index da915517635c..d971621f398f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,17 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.control_service import pagers from google.cloud.discoveryengine_v1beta.types import common from google.cloud.discoveryengine_v1beta.types import control from google.cloud.discoveryengine_v1beta.types import control as gcd_control from google.cloud.discoveryengine_v1beta.types import control_service - -from .transports.base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from .transports.base import ControlServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ControlServiceGrpcTransport from .transports.grpc_asyncio import ControlServiceGrpcAsyncIOTransport from .transports.rest import ControlServiceRestTransport @@ -85,9 +83,7 @@ class ControlServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ControlServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] _transport_registry["grpc"] = ControlServiceGrpcTransport _transport_registry["grpc_asyncio"] = ControlServiceGrpcAsyncIOTransport _transport_registry["rest"] = ControlServiceRestTransport @@ -637,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ControlServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ControlServiceClient._read_environment_variables() + ) self._client_cert_source = ControlServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -676,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ControlServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1056,8 +1049,8 @@ def sample_update_control(): [Control][google.cloud.discoveryengine.v1beta.Control] to update. The following are NOT supported: - - [Control.name][google.cloud.discoveryengine.v1beta.Control.name] - - [Control.solution_type][google.cloud.discoveryengine.v1beta.Control.solution_type] + - [Control.name][google.cloud.discoveryengine.v1beta.Control.name] + - [Control.solution_type][google.cloud.discoveryengine.v1beta.Control.solution_type] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py index a1486ca1e14b..21c5cb6c09ec 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import control, control_service +from google.cloud.discoveryengine_v1beta.types import control +from google.cloud.discoveryengine_v1beta.types import control_service class ListControlsPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/__init__.py index 3e0b9c56088b..4c3c6cfd5dbb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import ControlServiceTransport from .grpc import ControlServiceGrpcTransport from .grpc_asyncio import ControlServiceGrpcAsyncIOTransport -from .rest import ControlServiceRestInterceptor, ControlServiceRestTransport +from .rest import ControlServiceRestTransport +from .rest import ControlServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ControlServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py index ba414265cc34..2f68c0cb686f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/base.py @@ -16,22 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import control from google.cloud.discoveryengine_v1beta.types import control as gcd_control from google.cloud.discoveryengine_v1beta.types import control_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -261,7 +262,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py index 565c95b76904..9bc20ca54ab2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc.py @@ -16,26 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import control from google.cloud.discoveryengine_v1beta.types import control as gcd_control from google.cloud.discoveryengine_v1beta.types import control_service - -from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ControlServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py index 3c7f3db9fd36..fceab5d39d66 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/grpc_asyncio.py @@ -15,30 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1beta.types import control from google.cloud.discoveryengine_v1beta.types import control as gcd_control from google.cloud.discoveryengine_v1beta.types import control_service - -from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ControlServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ControlServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py index 0a6dac3c2688..fd9b0d34c047 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest.py @@ -13,30 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1beta.types import control from google.cloud.discoveryengine_v1beta.types import control as gcd_control from google.cloud.discoveryengine_v1beta.types import control_service +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseControlServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -1295,9 +1301,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseControlServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py index 565632c5892a..13314ef4fb39 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/control_service/transports/rest_base.py @@ -14,20 +14,22 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ControlServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1beta.types import control from google.cloud.discoveryengine_v1beta.types import control as gcd_control from google.cloud.discoveryengine_v1beta.types import control_service - -from .base import DEFAULT_CLIENT_INFO, ControlServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseControlServiceRestTransport(ControlServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/__init__.py index 733efd06389f..504962bdc81a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ConversationalSearchServiceAsyncClient from .client import ConversationalSearchServiceClient +from .async_client import ConversationalSearchServiceAsyncClient __all__ = ( "ConversationalSearchServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py index 8cb819a55752..3e4790cd336d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,42 +29,39 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( pagers, ) -from google.cloud.discoveryengine_v1beta.types import ( - conversational_search_service, - search_service, -) -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1beta.types import answer from google.cloud.discoveryengine_v1beta.types import conversation +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1beta.types import conversational_search_service +from google.cloud.discoveryengine_v1beta.types import search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session - -from .client import ConversationalSearchServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ConversationalSearchServiceGrpcAsyncIOTransport +from .client import ConversationalSearchServiceClient try: from google.api_core import client_logging # type: ignore @@ -164,7 +161,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_info.__func__(ConversationalSearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ConversationalSearchServiceClient.from_service_account_info.__func__( + ConversationalSearchServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -180,7 +179,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ConversationalSearchServiceAsyncClient: The constructed client. """ - return ConversationalSearchServiceClient.from_service_account_file.__func__(ConversationalSearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ConversationalSearchServiceClient.from_service_account_file.__func__( + ConversationalSearchServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -218,7 +219,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ConversationalSearchServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ConversationalSearchServiceTransport: @@ -767,7 +770,7 @@ async def sample_update_conversation(): [Conversation][google.cloud.discoveryengine.v1beta.Conversation] to update. The following are NOT supported: - - [Conversation.name][google.cloud.discoveryengine.v1beta.Conversation.name] + - [Conversation.name][google.cloud.discoveryengine.v1beta.Conversation.name] If not set or empty, all supported fields are updated. @@ -1578,7 +1581,7 @@ async def sample_update_session(): [Session][google.cloud.discoveryengine.v1beta.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1beta.Session.name] + - [Session.name][google.cloud.discoveryengine.v1beta.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py index 91e14d343429..104c72a67628 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,25 +61,21 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( pagers, ) -from google.cloud.discoveryengine_v1beta.types import ( - conversational_search_service, - search_service, -) -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1beta.types import answer from google.cloud.discoveryengine_v1beta.types import conversation +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1beta.types import conversational_search_service +from google.cloud.discoveryengine_v1beta.types import search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session - -from .transports.base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ConversationalSearchServiceGrpcTransport from .transports.grpc_asyncio import ConversationalSearchServiceGrpcAsyncIOTransport from .transports.rest import ConversationalSearchServiceRestTransport @@ -93,13 +89,11 @@ class ConversationalSearchServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ConversationalSearchServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport - _transport_registry[ - "grpc_asyncio" - ] = ConversationalSearchServiceGrpcAsyncIOTransport + _transport_registry["grpc_asyncio"] = ( + ConversationalSearchServiceGrpcAsyncIOTransport + ) _transport_registry["rest"] = ConversationalSearchServiceRestTransport def get_transport_class( @@ -779,11 +773,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ConversationalSearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ConversationalSearchServiceClient._read_environment_variables() + ) self._client_cert_source = ( ConversationalSearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -820,8 +812,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ConversationalSearchServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1308,7 +1299,7 @@ def sample_update_conversation(): [Conversation][google.cloud.discoveryengine.v1beta.Conversation] to update. The following are NOT supported: - - [Conversation.name][google.cloud.discoveryengine.v1beta.Conversation.name] + - [Conversation.name][google.cloud.discoveryengine.v1beta.Conversation.name] If not set or empty, all supported fields are updated. @@ -2099,7 +2090,7 @@ def sample_update_session(): [Session][google.cloud.discoveryengine.v1beta.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1beta.Session.name] + - [Session.name][google.cloud.discoveryengine.v1beta.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py index a49e184bfdeb..7ad460e919cb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,11 +37,9 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - conversation, - conversational_search_service, - session, -) +from google.cloud.discoveryengine_v1beta.types import conversation +from google.cloud.discoveryengine_v1beta.types import conversational_search_service +from google.cloud.discoveryengine_v1beta.types import session class ListConversationsPager: @@ -71,7 +68,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -151,7 +148,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -233,7 +230,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -311,7 +308,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py index 855e35aad0c0..88c3053fe65f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import ConversationalSearchServiceTransport from .grpc import ConversationalSearchServiceGrpcTransport from .grpc_asyncio import ConversationalSearchServiceGrpcAsyncIOTransport -from .rest import ( - ConversationalSearchServiceRestInterceptor, - ConversationalSearchServiceRestTransport, -) +from .rest import ConversationalSearchServiceRestTransport +from .rest import ConversationalSearchServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ConversationalSearchServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ConversationalSearchServiceTransport]] _transport_registry["grpc"] = ConversationalSearchServiceGrpcTransport _transport_registry["grpc_asyncio"] = ConversationalSearchServiceGrpcAsyncIOTransport _transport_registry["rest"] = ConversationalSearchServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py index 6934e2a7a1dc..90b068e9a60c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/base.py @@ -16,25 +16,26 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import answer from google.cloud.discoveryengine_v1beta.types import conversation +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -385,7 +386,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py index 131a37cfd5bd..3db7acb62ec1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc.py @@ -16,29 +16,30 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import answer from google.cloud.discoveryengine_v1beta.types import conversation +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py index 45e9effbe00b..41e7ae480ded 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/grpc_asyncio.py @@ -15,33 +15,34 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import answer from google.cloud.discoveryengine_v1beta.types import conversation +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ConversationalSearchServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py index 2087c6d7b598..13e6ff8ec577 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest.py @@ -13,33 +13,39 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import answer from google.cloud.discoveryengine_v1beta.types import conversation +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseConversationalSearchServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -977,9 +983,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_http_options() request, metadata = self._interceptor.pre_answer_query(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseAnswerQuery._get_transcoded_request( @@ -1139,9 +1143,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseConverseConversation._get_http_options() request, metadata = self._interceptor.pre_converse_conversation( request, metadata @@ -1299,9 +1301,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateConversation._get_http_options() request, metadata = self._interceptor.pre_create_conversation( request, metadata @@ -1452,9 +1452,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_http_options() request, metadata = self._interceptor.pre_create_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseCreateSession._get_transcoded_request( @@ -1601,9 +1599,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteConversation._get_http_options() request, metadata = self._interceptor.pre_delete_conversation( request, metadata @@ -1710,9 +1706,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_http_options() request, metadata = self._interceptor.pre_delete_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseDeleteSession._get_transcoded_request( @@ -1823,9 +1817,7 @@ def __call__( Defines an answer. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_http_options() request, metadata = self._interceptor.pre_get_answer(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetAnswer._get_transcoded_request( @@ -1972,9 +1964,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetConversation._get_http_options() request, metadata = self._interceptor.pre_get_conversation( request, metadata @@ -2121,9 +2111,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_http_options() request, metadata = self._interceptor.pre_get_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetSession._get_transcoded_request( @@ -2270,9 +2258,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListConversations._get_http_options() request, metadata = self._interceptor.pre_list_conversations( request, metadata @@ -2421,9 +2407,7 @@ def __call__( Response for ListSessions method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_http_options() request, metadata = self._interceptor.pre_list_sessions(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListSessions._get_transcoded_request( @@ -2576,9 +2560,7 @@ def __call__( """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateConversation._get_http_options() request, metadata = self._interceptor.pre_update_conversation( request, metadata @@ -2729,9 +2711,7 @@ def __call__( External session proto definition. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_http_options() request, metadata = self._interceptor.pre_update_session(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseUpdateSession._get_transcoded_request( @@ -3015,9 +2995,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3140,9 +3118,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -3283,9 +3259,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseConversationalSearchServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py index 86349a8bf62d..e1ed5c4999b4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/conversational_search_service/transports/rest_base.py @@ -14,23 +14,25 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ConversationalSearchServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import answer from google.cloud.discoveryengine_v1beta.types import conversation +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, ConversationalSearchServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseConversationalSearchServiceRestTransport( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/__init__.py index aaea8b56ac8a..b8c5d59ab4e4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import DataStoreServiceAsyncClient from .client import DataStoreServiceClient +from .async_client import DataStoreServiceAsyncClient __all__ = ( "DataStoreServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py index 07a111abc18e..82285f7fed67 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,25 +47,21 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.services.data_store_service import pagers +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import data_store +from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1beta.types import data_store_service +from google.cloud.discoveryengine_v1beta.types import document_processing_config +from google.cloud.discoveryengine_v1beta.types import schema from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.services.data_store_service import pagers -from google.cloud.discoveryengine_v1beta.types import ( - data_store_service, - document_processing_config, - schema, -) -from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import data_store - -from .client import DataStoreServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from .transports.base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import DataStoreServiceGrpcAsyncIOTransport +from .client import DataStoreServiceClient try: from google.api_core import client_logging # type: ignore @@ -141,7 +138,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_info.__func__(DataStoreServiceAsyncClient, info, *args, **kwargs) # type: ignore + return DataStoreServiceClient.from_service_account_info.__func__( + DataStoreServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +156,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DataStoreServiceAsyncClient: The constructed client. """ - return DataStoreServiceClient.from_service_account_file.__func__(DataStoreServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return DataStoreServiceClient.from_service_account_file.__func__( + DataStoreServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py index 6af99614c6d8..9f0dda4be6a0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,23 +63,19 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.services.data_store_service import pagers +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import data_store +from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1beta.types import data_store_service +from google.cloud.discoveryengine_v1beta.types import document_processing_config +from google.cloud.discoveryengine_v1beta.types import schema from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.services.data_store_service import pagers -from google.cloud.discoveryengine_v1beta.types import ( - data_store_service, - document_processing_config, - schema, -) -from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import data_store - -from .transports.base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from .transports.base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import DataStoreServiceGrpcTransport from .transports.grpc_asyncio import DataStoreServiceGrpcAsyncIOTransport from .transports.rest import DataStoreServiceRestTransport @@ -93,9 +89,7 @@ class DataStoreServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DataStoreServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] _transport_registry["grpc"] = DataStoreServiceGrpcTransport _transport_registry["grpc_asyncio"] = DataStoreServiceGrpcAsyncIOTransport _transport_registry["rest"] = DataStoreServiceRestTransport @@ -692,11 +686,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DataStoreServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DataStoreServiceClient._read_environment_variables() + ) self._client_cert_source = DataStoreServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -731,8 +723,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DataStoreServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py index d0f8b59dd333..8e306d85968a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import data_store, data_store_service +from google.cloud.discoveryengine_v1beta.types import data_store +from google.cloud.discoveryengine_v1beta.types import data_store_service class ListDataStoresPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/__init__.py index 70a5571eccbe..9230588b12ff 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import DataStoreServiceTransport from .grpc import DataStoreServiceGrpcTransport from .grpc_asyncio import DataStoreServiceGrpcAsyncIOTransport -from .rest import DataStoreServiceRestInterceptor, DataStoreServiceRestTransport +from .rest import DataStoreServiceRestTransport +from .rest import DataStoreServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[DataStoreServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py index 16d1f574b1a1..f277a41c145c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/base.py @@ -16,21 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1beta.types import data_store +from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1beta.types import data_store_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -265,7 +267,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py index 34171a829227..d18c34e12d35 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1beta.types import data_store +from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1beta.types import data_store_service - -from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py index 0230fe0f5c31..6dd9d74edaf8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/grpc_asyncio.py @@ -15,29 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1beta.types import data_store +from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1beta.types import data_store_service - -from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO from .grpc import DataStoreServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py index 4801b5d48cac..6943ba2701f0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest.py @@ -13,29 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + -from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1beta.types import data_store +from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1beta.types import data_store_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDataStoreServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -758,9 +765,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCreateDataStore._get_http_options() request, metadata = self._interceptor.pre_create_data_store( request, metadata @@ -913,9 +918,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseDeleteDataStore._get_http_options() request, metadata = self._interceptor.pre_delete_data_store( request, metadata @@ -1210,9 +1213,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListDataStores._get_http_options() request, metadata = self._interceptor.pre_list_data_stores( request, metadata @@ -1364,9 +1365,7 @@ def __call__( """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseUpdateDataStore._get_http_options() request, metadata = self._interceptor.pre_update_data_store( request, metadata @@ -1566,9 +1565,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1828,9 +1825,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDataStoreServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDataStoreServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py index caabb77ccfcb..f157367249d3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/data_store_service/transports/rest_base.py @@ -14,19 +14,21 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import DataStoreServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format -from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1beta.types import data_store +from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store from google.cloud.discoveryengine_v1beta.types import data_store_service - -from .base import DEFAULT_CLIENT_INFO, DataStoreServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseDataStoreServiceRestTransport(DataStoreServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/__init__.py index 0bd096115c9e..4d6f3ee464d0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import DocumentServiceAsyncClient from .client import DocumentServiceClient +from .async_client import DocumentServiceAsyncClient __all__ = ( "DocumentServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py index fe146fc67c62..fa665d9f0d54 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,24 +47,20 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.services.document_service import pagers +from google.cloud.discoveryengine_v1beta.types import document +from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.cloud.discoveryengine_v1beta.types import document_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.services.document_service import pagers -from google.cloud.discoveryengine_v1beta.types import ( - document_service, - import_config, - purge_config, -) -from google.cloud.discoveryengine_v1beta.types import document -from google.cloud.discoveryengine_v1beta.types import document as gcd_document - -from .client import DocumentServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from .transports.base import DocumentServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import DocumentServiceGrpcAsyncIOTransport +from .client import DocumentServiceClient try: from google.api_core import client_logging # type: ignore @@ -138,7 +135,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_info.__func__(DocumentServiceAsyncClient, info, *args, **kwargs) # type: ignore + return DocumentServiceClient.from_service_account_info.__func__( + DocumentServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -154,7 +153,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: DocumentServiceAsyncClient: The constructed client. """ - return DocumentServiceClient.from_service_account_file.__func__(DocumentServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return DocumentServiceClient.from_service_account_file.__func__( + DocumentServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py index 251bd8fe92f0..f5b1bfb3a316 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,22 +63,18 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.services.document_service import pagers +from google.cloud.discoveryengine_v1beta.types import document +from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.cloud.discoveryengine_v1beta.types import document_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.services.document_service import pagers -from google.cloud.discoveryengine_v1beta.types import ( - document_service, - import_config, - purge_config, -) -from google.cloud.discoveryengine_v1beta.types import document -from google.cloud.discoveryengine_v1beta.types import document as gcd_document - -from .transports.base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from .transports.base import DocumentServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import DocumentServiceGrpcTransport from .transports.grpc_asyncio import DocumentServiceGrpcAsyncIOTransport from .transports.rest import DocumentServiceRestTransport @@ -92,9 +88,7 @@ class DocumentServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[DocumentServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] _transport_registry["grpc"] = DocumentServiceGrpcTransport _transport_registry["grpc_asyncio"] = DocumentServiceGrpcAsyncIOTransport _transport_registry["rest"] = DocumentServiceRestTransport @@ -701,11 +695,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = DocumentServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + DocumentServiceClient._read_environment_variables() + ) self._client_cert_source = DocumentServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -740,8 +732,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(DocumentServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py index 6977cda8ad51..b9cb2ff33314 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import document, document_service +from google.cloud.discoveryengine_v1beta.types import document +from google.cloud.discoveryengine_v1beta.types import document_service class ListDocumentsPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/__init__.py index 08578a95ea6d..de821c2b2022 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import DocumentServiceTransport from .grpc import DocumentServiceGrpcTransport from .grpc_asyncio import DocumentServiceGrpcAsyncIOTransport -from .rest import DocumentServiceRestInterceptor, DocumentServiceRestTransport +from .rest import DocumentServiceRestTransport +from .rest import DocumentServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[DocumentServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py index bba7dd8d66da..68a31ddc18f4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/base.py @@ -16,26 +16,26 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.cloud.discoveryengine_v1beta.types import document_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -324,7 +324,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py index d433ba4b2b19..700a280c46f9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc.py @@ -16,30 +16,30 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document - -from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from google.cloud.discoveryengine_v1beta.types import document_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import DocumentServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -586,12 +586,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py index e49316923f5f..ed7079a2aa34 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/grpc_asyncio.py @@ -15,34 +15,34 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document - -from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from google.cloud.discoveryengine_v1beta.types import document_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import DocumentServiceTransport, DEFAULT_CLIENT_INFO from .grpc import DocumentServiceGrpcTransport try: @@ -603,12 +603,12 @@ def batch_get_documents_metadata( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "batch_get_documents_metadata" not in self._stubs: - self._stubs[ - "batch_get_documents_metadata" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", - request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, - response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + self._stubs["batch_get_documents_metadata"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.DocumentService/BatchGetDocumentsMetadata", + request_serializer=document_service.BatchGetDocumentsMetadataRequest.serialize, + response_deserializer=document_service.BatchGetDocumentsMetadataResponse.deserialize, + ) ) return self._stubs["batch_get_documents_metadata"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py index 8353af5ec1e1..d161dd72bf3f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest.py @@ -13,34 +13,39 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + -from google.cloud.discoveryengine_v1beta.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.cloud.discoveryengine_v1beta.types import document_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseDocumentServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -890,9 +895,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseBatchGetDocumentsMetadata._get_http_options() request, metadata = self._interceptor.pre_batch_get_documents_metadata( request, metadata @@ -1048,9 +1051,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_http_options() request, metadata = self._interceptor.pre_create_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseCreateDocument._get_transcoded_request( @@ -1195,9 +1196,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_http_options() request, metadata = self._interceptor.pre_delete_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseDeleteDocument._get_transcoded_request( @@ -1458,9 +1457,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseImportDocuments._get_http_options() request, metadata = self._interceptor.pre_import_documents( request, metadata @@ -1764,9 +1761,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_http_options() request, metadata = self._interceptor.pre_purge_documents(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BasePurgeDocuments._get_transcoded_request( @@ -1917,9 +1912,7 @@ def __call__( """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_http_options() request, metadata = self._interceptor.pre_update_document(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseUpdateDocument._get_transcoded_request( @@ -2021,7 +2014,9 @@ def batch_get_documents_metadata( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchGetDocumentsMetadata(self._session, self._host, self._interceptor) # type: ignore + return self._BatchGetDocumentsMetadata( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_document( @@ -2136,9 +2131,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -2398,9 +2391,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseDocumentServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseDocumentServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py index 3a2a42e6f465..e447e433cfd1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/document_service/transports/rest_base.py @@ -14,24 +14,24 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import DocumentServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format -from google.cloud.discoveryengine_v1beta.types import ( - document_service, - import_config, - purge_config, -) from google.cloud.discoveryengine_v1beta.types import document from google.cloud.discoveryengine_v1beta.types import document as gcd_document - -from .base import DEFAULT_CLIENT_INFO, DocumentServiceTransport +from google.cloud.discoveryengine_v1beta.types import document_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseDocumentServiceRestTransport(DocumentServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/__init__.py index f028860e65ae..e6da99d73e86 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import EngineServiceAsyncClient from .client import EngineServiceClient +from .async_client import EngineServiceAsyncClient __all__ = ( "EngineServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py index 61cebfea2d44..c38c800adcd2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,21 +47,19 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.engine_service import pagers from google.cloud.discoveryengine_v1beta.types import common from google.cloud.discoveryengine_v1beta.types import engine from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine from google.cloud.discoveryengine_v1beta.types import engine_service - -from .client import EngineServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import EngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import EngineServiceGrpcAsyncIOTransport +from .client import EngineServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +127,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_info.__func__(EngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + return EngineServiceClient.from_service_account_info.__func__( + EngineServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EngineServiceAsyncClient: The constructed client. """ - return EngineServiceClient.from_service_account_file.__func__(EngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return EngineServiceClient.from_service_account_file.__func__( + EngineServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py index 3fb860fefcf8..019d0dff8fbe 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,19 +63,17 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.engine_service import pagers from google.cloud.discoveryengine_v1beta.types import common from google.cloud.discoveryengine_v1beta.types import engine from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine from google.cloud.discoveryengine_v1beta.types import engine_service - -from .transports.base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import EngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import EngineServiceGrpcTransport from .transports.grpc_asyncio import EngineServiceGrpcAsyncIOTransport from .transports.rest import EngineServiceRestTransport @@ -639,11 +637,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EngineServiceClient._read_environment_variables() + ) self._client_cert_source = EngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -678,8 +674,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py index e7a17a16adc3..266d58d62692 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import engine, engine_service +from google.cloud.discoveryengine_v1beta.types import engine +from google.cloud.discoveryengine_v1beta.types import engine_service class ListEnginesPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/__init__.py index b4ffb09de4fe..196454992873 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import EngineServiceTransport from .grpc import EngineServiceGrpcTransport from .grpc_asyncio import EngineServiceGrpcAsyncIOTransport -from .rest import EngineServiceRestInterceptor, EngineServiceRestTransport +from .rest import EngineServiceRestTransport +from .rest import EngineServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[EngineServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py index ef2757af7ad4..8deea05591ea 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/base.py @@ -16,21 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import engine from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine from google.cloud.discoveryengine_v1beta.types import engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -307,7 +309,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py index 5870795ef656..945c60af923d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc.py @@ -16,25 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import engine from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine from google.cloud.discoveryengine_v1beta.types import engine_service - -from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EngineServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py index d9b75c05f3c8..28cda1585d90 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/grpc_asyncio.py @@ -15,29 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1beta.types import engine from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine from google.cloud.discoveryengine_v1beta.types import engine_service - -from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EngineServiceTransport, DEFAULT_CLIENT_INFO from .grpc import EngineServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py index 887e62d08bd5..d2c60051a5e3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest.py @@ -13,29 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1beta.types import engine from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine from google.cloud.discoveryengine_v1beta.types import engine_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEngineServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py index 707a597badfb..e5183d81c42b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/engine_service/transports/rest_base.py @@ -14,19 +14,21 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import EngineServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1beta.types import engine from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine from google.cloud.discoveryengine_v1beta.types import engine_service - -from .base import DEFAULT_CLIENT_INFO, EngineServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseEngineServiceRestTransport(EngineServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/__init__.py index 9cbde8f5c38c..f2bfe018defb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import EvaluationServiceAsyncClient from .client import EvaluationServiceClient +from .async_client import EvaluationServiceAsyncClient __all__ = ( "EvaluationServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py index 43947eb1ca8f..1bc11d150c3c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,19 +47,17 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1beta.types import evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.services.evaluation_service import pagers -from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation_service - -from .client import EvaluationServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport +from .transports.base import EvaluationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import EvaluationServiceGrpcAsyncIOTransport +from .client import EvaluationServiceClient try: from google.api_core import client_logging # type: ignore @@ -144,7 +143,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_info.__func__(EvaluationServiceAsyncClient, info, *args, **kwargs) # type: ignore + return EvaluationServiceClient.from_service_account_info.__func__( + EvaluationServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -160,7 +161,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: EvaluationServiceAsyncClient: The constructed client. """ - return EvaluationServiceClient.from_service_account_file.__func__(EvaluationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return EvaluationServiceClient.from_service_account_file.__func__( + EvaluationServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py index fb25635d3e51..d0baf6c3230a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,17 +63,15 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1beta.types import evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.services.evaluation_service import pagers -from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation -from google.cloud.discoveryengine_v1beta.types import evaluation_service - -from .transports.base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport +from .transports.base import EvaluationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import EvaluationServiceGrpcTransport from .transports.grpc_asyncio import EvaluationServiceGrpcAsyncIOTransport from .transports.rest import EvaluationServiceRestTransport @@ -87,9 +85,7 @@ class EvaluationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[EvaluationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[EvaluationServiceTransport]] _transport_registry["grpc"] = EvaluationServiceGrpcTransport _transport_registry["grpc_asyncio"] = EvaluationServiceGrpcAsyncIOTransport _transport_registry["rest"] = EvaluationServiceRestTransport @@ -776,11 +772,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = EvaluationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + EvaluationServiceClient._read_environment_variables() + ) self._client_cert_source = EvaluationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -815,8 +809,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(EvaluationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py index 9a3049cfa341..01f0bcdb2daf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service +from google.cloud.discoveryengine_v1beta.types import evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation_service class ListEvaluationsPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +223,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -303,7 +303,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/__init__.py index c3cac92e11d7..12617337e606 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import EvaluationServiceTransport from .grpc import EvaluationServiceGrpcTransport from .grpc_asyncio import EvaluationServiceGrpcAsyncIOTransport -from .rest import EvaluationServiceRestInterceptor, EvaluationServiceRestTransport +from .rest import EvaluationServiceRestTransport +from .rest import EvaluationServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[EvaluationServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py index ecb3b1f1aa7f..e4e5ca3f53ea 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/base.py @@ -16,19 +16,22 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service +from google.cloud.discoveryengine_v1beta.types import evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -252,7 +255,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py index eab8f572169b..df6658891af4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc.py @@ -16,23 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service - -from .base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport +from google.cloud.discoveryengine_v1beta.types import evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EvaluationServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py index f1d611ceb6af..11d9816be0f0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/grpc_asyncio.py @@ -15,27 +15,30 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service - -from .base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport +from google.cloud.discoveryengine_v1beta.types import evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import EvaluationServiceTransport, DEFAULT_CLIENT_INFO from .grpc import EvaluationServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py index 54e4267e7cd7..7eb0ad194777 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest.py @@ -13,27 +13,35 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1beta.types import evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseEvaluationServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -701,9 +709,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCreateEvaluation._get_http_options() request, metadata = self._interceptor.pre_create_evaluation( request, metadata @@ -857,9 +863,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_http_options() request, metadata = self._interceptor.pre_get_evaluation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetEvaluation._get_transcoded_request( @@ -1007,9 +1011,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluationResults._get_http_options() request, metadata = self._interceptor.pre_list_evaluation_results( request, metadata @@ -1165,9 +1167,7 @@ def __call__( """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListEvaluations._get_http_options() request, metadata = self._interceptor.pre_list_evaluations( request, metadata @@ -1355,9 +1355,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1477,9 +1475,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1618,9 +1614,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseEvaluationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseEvaluationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest_base.py index cabc59b6db94..7c554638911e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/evaluation_service/transports/rest_base.py @@ -14,17 +14,20 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import EvaluationServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1beta.types import evaluation, evaluation_service +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, EvaluationServiceTransport + +from google.cloud.discoveryengine_v1beta.types import evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation_service +from google.longrunning import operations_pb2 # type: ignore class _BaseEvaluationServiceRestTransport(EvaluationServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/__init__.py index 6fea6cab0de9..4cfbfc0e118a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import GroundedGenerationServiceAsyncClient from .client import GroundedGenerationServiceClient +from .async_client import GroundedGenerationServiceAsyncClient __all__ = ( "GroundedGenerationServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py index c65372ddc526..8c3436dfa32a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/async_client.py @@ -13,51 +13,48 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - AsyncIterable, - AsyncIterator, - Awaitable, - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, Optional, + AsyncIterable, + Awaitable, + AsyncIterator, Sequence, Tuple, Type, Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1beta.types import grounded_generation_service +from google.cloud.discoveryengine_v1beta.types import grounding from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import ( - grounded_generation_service, - grounding, -) - -from .client import GroundedGenerationServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from .transports.base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import GroundedGenerationServiceGrpcAsyncIOTransport +from .client import GroundedGenerationServiceClient try: from google.api_core import client_logging # type: ignore @@ -143,7 +140,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_info.__func__(GroundedGenerationServiceAsyncClient, info, *args, **kwargs) # type: ignore + return GroundedGenerationServiceClient.from_service_account_info.__func__( + GroundedGenerationServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -159,7 +158,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: GroundedGenerationServiceAsyncClient: The constructed client. """ - return GroundedGenerationServiceClient.from_service_account_file.__func__(GroundedGenerationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return GroundedGenerationServiceClient.from_service_account_file.__func__( + GroundedGenerationServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -197,7 +198,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return GroundedGenerationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> GroundedGenerationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py index 593a48b016a6..c9a67677649f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/client.py @@ -20,14 +20,14 @@ import os import re from typing import ( - Callable, Dict, - Iterable, - Iterator, + Callable, Mapping, MutableMapping, MutableSequence, Optional, + Iterable, + Iterator, Sequence, Tuple, Type, @@ -36,19 +36,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,15 +63,11 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1beta.types import grounded_generation_service +from google.cloud.discoveryengine_v1beta.types import grounding from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import ( - grounded_generation_service, - grounding, -) - -from .transports.base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from .transports.base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import GroundedGenerationServiceGrpcTransport from .transports.grpc_asyncio import GroundedGenerationServiceGrpcAsyncIOTransport from .transports.rest import GroundedGenerationServiceRestTransport @@ -85,9 +81,7 @@ class GroundedGenerationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[GroundedGenerationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport @@ -656,11 +650,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = GroundedGenerationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + GroundedGenerationServiceClient._read_environment_variables() + ) self._client_cert_source = ( GroundedGenerationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -697,8 +689,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(GroundedGenerationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py index 0f3052cbd079..bf39f5e977bd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import GroundedGenerationServiceTransport from .grpc import GroundedGenerationServiceGrpcTransport from .grpc_asyncio import GroundedGenerationServiceGrpcAsyncIOTransport -from .rest import ( - GroundedGenerationServiceRestInterceptor, - GroundedGenerationServiceRestTransport, -) +from .rest import GroundedGenerationServiceRestTransport +from .rest import GroundedGenerationServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[GroundedGenerationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[GroundedGenerationServiceTransport]] _transport_registry["grpc"] = GroundedGenerationServiceGrpcTransport _transport_registry["grpc_asyncio"] = GroundedGenerationServiceGrpcAsyncIOTransport _transport_registry["rest"] = GroundedGenerationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py index b4558b69cab9..513abb68e80a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import grounded_generation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -236,7 +237,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py index 97c4b7a47cff..f1e6350b7491 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import grounded_generation_service - -from .base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -346,12 +347,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py index 248264e393c3..e47237d9603e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1beta.types import grounded_generation_service - -from .base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO from .grpc import GroundedGenerationServiceGrpcTransport try: @@ -354,12 +355,12 @@ def stream_generate_grounded_content( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "stream_generate_grounded_content" not in self._stubs: - self._stubs[ - "stream_generate_grounded_content" - ] = self._logged_channel.stream_stream( - "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", - request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, - response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + self._stubs["stream_generate_grounded_content"] = ( + self._logged_channel.stream_stream( + "/google.cloud.discoveryengine.v1beta.GroundedGenerationService/StreamGenerateGroundedContent", + request_serializer=grounded_generation_service.GenerateGroundedContentRequest.serialize, + response_deserializer=grounded_generation_service.GenerateGroundedContentResponse.deserialize, + ) ) return self._stubs["stream_generate_grounded_content"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py index 4f218f7971e9..443673c33012 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1beta.types import grounded_generation_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseGroundedGenerationServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -424,9 +430,7 @@ def __call__( """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_http_options() request, metadata = self._interceptor.pre_check_grounding(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseCheckGrounding._get_transcoded_request( @@ -584,9 +588,7 @@ def __call__( Response for the ``GenerateGroundedContent`` method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGenerateGroundedContent._get_http_options() request, metadata = self._interceptor.pre_generate_grounded_content( request, metadata @@ -726,7 +728,9 @@ def generate_grounded_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._GenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._GenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def stream_generate_grounded_content( @@ -737,7 +741,9 @@ def stream_generate_grounded_content( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._StreamGenerateGroundedContent(self._session, self._host, self._interceptor) # type: ignore + return self._StreamGenerateGroundedContent( + self._session, self._host, self._interceptor + ) # type: ignore @property def cancel_operation(self): @@ -795,9 +801,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -920,9 +924,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1063,9 +1065,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseGroundedGenerationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest_base.py index 76ccf1537760..293db504dd40 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/grounded_generation_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import GroundedGenerationServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1beta.types import grounded_generation_service - -from .base import DEFAULT_CLIENT_INFO, GroundedGenerationServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseGroundedGenerationServiceRestTransport(GroundedGenerationServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/__init__.py index 92a56900c029..f42a6de5f23b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ProjectServiceAsyncClient from .client import ProjectServiceClient +from .async_client import ProjectServiceAsyncClient __all__ = ( "ProjectServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py index 552a89a63156..b69be1062304 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,14 +47,13 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.types import project +from google.cloud.discoveryengine_v1beta.types import project_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import project, project_service - -from .client import ProjectServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from .transports.base import ProjectServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ProjectServiceGrpcAsyncIOTransport +from .client import ProjectServiceClient try: from google.api_core import client_logging # type: ignore @@ -119,7 +119,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_info.__func__(ProjectServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ProjectServiceClient.from_service_account_info.__func__( + ProjectServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -135,7 +137,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ProjectServiceAsyncClient: The constructed client. """ - return ProjectServiceClient.from_service_account_file.__func__(ProjectServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ProjectServiceClient.from_service_account_file.__func__( + ProjectServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py index ac35ae297646..f5b60ef3f3a2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,12 +63,11 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.types import project +from google.cloud.discoveryengine_v1beta.types import project_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import project, project_service - -from .transports.base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from .transports.base import ProjectServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ProjectServiceGrpcTransport from .transports.grpc_asyncio import ProjectServiceGrpcAsyncIOTransport from .transports.rest import ProjectServiceRestTransport @@ -82,9 +81,7 @@ class ProjectServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ProjectServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] _transport_registry["grpc"] = ProjectServiceGrpcTransport _transport_registry["grpc_asyncio"] = ProjectServiceGrpcAsyncIOTransport _transport_registry["rest"] = ProjectServiceRestTransport @@ -601,11 +598,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ProjectServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ProjectServiceClient._read_environment_variables() + ) self._client_cert_source = ProjectServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -640,8 +635,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ProjectServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/__init__.py index 34168b4c507d..37999d2dc481 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import ProjectServiceTransport from .grpc import ProjectServiceGrpcTransport from .grpc_asyncio import ProjectServiceGrpcAsyncIOTransport -from .rest import ProjectServiceRestInterceptor, ProjectServiceRestTransport +from .rest import ProjectServiceRestTransport +from .rest import ProjectServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[ProjectServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py index e2901ae363a5..4bad67c3e110 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/base.py @@ -16,19 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import project_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -204,7 +206,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py index 06508f0203a3..2537d566e29a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import project_service - -from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ProjectServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py index d1bdfde6cdd3..8a0ea560c663 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/grpc_asyncio.py @@ -15,27 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1beta.types import project_service - -from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ProjectServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ProjectServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py index e0f89fde21a5..e395b5d6644d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest.py @@ -13,27 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1beta.types import project_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseProjectServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -523,9 +530,7 @@ def __call__( """ - http_options = ( - _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseProvisionProject._get_http_options() request, metadata = self._interceptor.pre_provision_project( request, metadata @@ -681,9 +686,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseProjectServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest_base.py index f76361df16e2..0e21526996f6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/project_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ProjectServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1beta.types import project_service - -from .base import DEFAULT_CLIENT_INFO, ProjectServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseProjectServiceRestTransport(ProjectServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/__init__.py index b87f3b8d87d4..cff8ae0bd628 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import RankServiceAsyncClient from .client import RankServiceClient +from .async_client import RankServiceAsyncClient __all__ = ( "RankServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py index 2c45bd54afed..bbe2f841ec8d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,29 +29,28 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1beta.types import rank_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import rank_service - -from .client import RankServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, RankServiceTransport +from .transports.base import RankServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import RankServiceGrpcAsyncIOTransport +from .client import RankServiceClient try: from google.api_core import client_logging # type: ignore @@ -113,7 +112,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_info.__func__(RankServiceAsyncClient, info, *args, **kwargs) # type: ignore + return RankServiceClient.from_service_account_info.__func__( + RankServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -129,7 +130,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RankServiceAsyncClient: The constructed client. """ - return RankServiceClient.from_service_account_file.__func__(RankServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return RankServiceClient.from_service_account_file.__func__( + RankServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py index 86f4066b4ab4..a751c5c1a113 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,12 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1beta.types import rank_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import rank_service - -from .transports.base import DEFAULT_CLIENT_INFO, RankServiceTransport +from .transports.base import RankServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import RankServiceGrpcTransport from .transports.grpc_asyncio import RankServiceGrpcAsyncIOTransport from .transports.rest import RankServiceRestTransport @@ -602,11 +600,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RankServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RankServiceClient._read_environment_variables() + ) self._client_cert_source = RankServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -641,8 +637,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RankServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/__init__.py index f45de8a44763..3ea75b53c7b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import RankServiceTransport from .grpc import RankServiceGrpcTransport from .grpc_asyncio import RankServiceGrpcAsyncIOTransport -from .rest import RankServiceRestInterceptor, RankServiceRestTransport +from .rest import RankServiceRestTransport +from .rest import RankServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[RankServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py index 43cd21f0f407..ae0d62d01734 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import rank_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -199,7 +200,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py index 58ff9c29dca8..1d6c98aca19a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import rank_service - -from .base import DEFAULT_CLIENT_INFO, RankServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RankServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py index 8375e6cb7fb3..c43650796dad 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1beta.types import rank_service - -from .base import DEFAULT_CLIENT_INFO, RankServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RankServiceTransport, DEFAULT_CLIENT_INFO from .grpc import RankServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py index 6f230c8ce341..f0307844df9f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1beta.types import rank_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseRankServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest_base.py index caca40327354..a529a1f4cd38 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/rank_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import RankServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1beta.types import rank_service - -from .base import DEFAULT_CLIENT_INFO, RankServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseRankServiceRestTransport(RankServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/__init__.py index 6a625342219a..4ddd61f41d3e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import RecommendationServiceAsyncClient from .client import RecommendationServiceClient +from .async_client import RecommendationServiceAsyncClient __all__ = ( "RecommendationServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py index 62924e4d001c..1102c9d4d4ff 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,29 +29,28 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore +from google.cloud.discoveryengine_v1beta.types import recommendation_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import recommendation_service - -from .client import RecommendationServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from .transports.base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import RecommendationServiceGrpcAsyncIOTransport +from .client import RecommendationServiceClient try: from google.api_core import client_logging # type: ignore @@ -127,7 +126,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_info.__func__(RecommendationServiceAsyncClient, info, *args, **kwargs) # type: ignore + return RecommendationServiceClient.from_service_account_info.__func__( + RecommendationServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +144,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: RecommendationServiceAsyncClient: The constructed client. """ - return RecommendationServiceClient.from_service_account_file.__func__(RecommendationServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return RecommendationServiceClient.from_service_account_file.__func__( + RecommendationServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -181,7 +184,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return RecommendationServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return RecommendationServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> RecommendationServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py index a3ecafd2e09c..1eaf6e5519a7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,12 +61,10 @@ _LOGGER = std_logging.getLogger(__name__) +from google.cloud.discoveryengine_v1beta.types import recommendation_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import recommendation_service - -from .transports.base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from .transports.base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import RecommendationServiceGrpcTransport from .transports.grpc_asyncio import RecommendationServiceGrpcAsyncIOTransport from .transports.rest import RecommendationServiceRestTransport @@ -80,9 +78,7 @@ class RecommendationServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[RecommendationServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport @@ -684,11 +680,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = RecommendationServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + RecommendationServiceClient._read_environment_variables() + ) self._client_cert_source = RecommendationServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -723,8 +717,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(RecommendationServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py index f21f53c111bf..a7477e51c44b 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import RecommendationServiceTransport from .grpc import RecommendationServiceGrpcTransport from .grpc_asyncio import RecommendationServiceGrpcAsyncIOTransport -from .rest import ( - RecommendationServiceRestInterceptor, - RecommendationServiceRestTransport, -) +from .rest import RecommendationServiceRestTransport +from .rest import RecommendationServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[RecommendationServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[RecommendationServiceTransport]] _transport_registry["grpc"] = RecommendationServiceGrpcTransport _transport_registry["grpc_asyncio"] = RecommendationServiceGrpcAsyncIOTransport _transport_registry["rest"] = RecommendationServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py index cd61f83a3dcf..796b013ce157 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import recommendation_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -202,7 +203,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py index 7f36002600fd..78ac5b80bbf7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import recommendation_service - -from .base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py index ed2eb3222390..1731c69b3efb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1beta.types import recommendation_service - -from .base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO from .grpc import RecommendationServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py index d60d15b2547b..ffbf529dbb59 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1beta.types import recommendation_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseRecommendationServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -358,9 +364,7 @@ def __call__( """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseRecommend._get_http_options() request, metadata = self._interceptor.pre_recommend(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseRecommend._get_transcoded_request( @@ -522,9 +526,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -647,9 +649,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -788,9 +788,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseRecommendationServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseRecommendationServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest_base.py index e5ff60ad2302..24742183de06 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/recommendation_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import RecommendationServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1beta.types import recommendation_service - -from .base import DEFAULT_CLIENT_INFO, RecommendationServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseRecommendationServiceRestTransport(RecommendationServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/__init__.py index 4cd0b5a2b9ae..db5a8d68d5b9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SampleQueryServiceAsyncClient from .client import SampleQueryServiceClient +from .async_client import SampleQueryServiceAsyncClient __all__ = ( "SampleQueryServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py index 9b267d313d5c..b34e9201dd18 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,20 +47,18 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.sample_query_service import pagers -from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import import_config from google.cloud.discoveryengine_v1beta.types import sample_query +from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import sample_query_service - -from .client import SampleQueryServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SampleQueryServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SampleQueryServiceGrpcAsyncIOTransport +from .client import SampleQueryServiceClient try: from google.api_core import client_logging # type: ignore @@ -131,7 +130,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_info.__func__(SampleQueryServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SampleQueryServiceClient.from_service_account_info.__func__( + SampleQueryServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -147,7 +148,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQueryServiceAsyncClient: The constructed client. """ - return SampleQueryServiceClient.from_service_account_file.__func__(SampleQueryServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SampleQueryServiceClient.from_service_account_file.__func__( + SampleQueryServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -185,7 +188,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQueryServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQueryServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py index 3ccc691336bb..c33a9e8950c6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,18 +63,16 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.sample_query_service import pagers -from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import import_config from google.cloud.discoveryengine_v1beta.types import sample_query +from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import sample_query_service - -from .transports.base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SampleQueryServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SampleQueryServiceGrpcTransport from .transports.grpc_asyncio import SampleQueryServiceGrpcAsyncIOTransport from .transports.rest import SampleQueryServiceRestTransport @@ -88,9 +86,7 @@ class SampleQueryServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQueryServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport @@ -642,11 +638,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQueryServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQueryServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQueryServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -681,8 +675,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQueryServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py index 2d8722fb80d9..9a631b16dfcf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import sample_query, sample_query_service +from google.cloud.discoveryengine_v1beta.types import sample_query +from google.cloud.discoveryengine_v1beta.types import sample_query_service class ListSampleQueriesPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -145,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py index 0f5acb01b776..021eee918899 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/__init__.py @@ -19,12 +19,12 @@ from .base import SampleQueryServiceTransport from .grpc import SampleQueryServiceGrpcTransport from .grpc_asyncio import SampleQueryServiceGrpcAsyncIOTransport -from .rest import SampleQueryServiceRestInterceptor, SampleQueryServiceRestTransport +from .rest import SampleQueryServiceRestTransport +from .rest import SampleQueryServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQueryServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQueryServiceTransport]] _transport_registry["grpc"] = SampleQueryServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQueryServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQueryServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py index cce4c52d8bfa..916b654aacfb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/base.py @@ -16,23 +16,25 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import import_config from google.cloud.discoveryengine_v1beta.types import sample_query +from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import sample_query_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -281,7 +283,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py index 6fe3b9e28646..9fe482584a65 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc.py @@ -16,27 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import import_config from google.cloud.discoveryengine_v1beta.types import sample_query +from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import sample_query_service - -from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SampleQueryServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py index b1f8d05cbb30..1122d76d961e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/grpc_asyncio.py @@ -15,31 +15,33 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import import_config from google.cloud.discoveryengine_v1beta.types import sample_query +from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import sample_query_service - -from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SampleQueryServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SampleQueryServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py index ef6fbf5ee1f0..c777daaf6c8f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest.py @@ -13,31 +13,38 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + -from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import import_config from google.cloud.discoveryengine_v1beta.types import sample_query +from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import sample_query_service +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQueryServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -778,9 +785,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCreateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_create_sample_query( request, metadata @@ -928,9 +933,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseDeleteSampleQuery._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query( request, metadata @@ -1045,9 +1048,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetSampleQuery._get_http_options() request, metadata = self._interceptor.pre_get_sample_query( request, metadata @@ -1198,9 +1199,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseImportSampleQueries._get_http_options() request, metadata = self._interceptor.pre_import_sample_queries( request, metadata @@ -1355,9 +1354,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListSampleQueries._get_http_options() request, metadata = self._interceptor.pre_list_sample_queries( request, metadata @@ -1509,9 +1506,7 @@ def __call__( """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseUpdateSampleQuery._get_http_options() request, metadata = self._interceptor.pre_update_sample_query( request, metadata @@ -1719,9 +1714,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1842,9 +1835,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1983,9 +1974,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQueryServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py index e1867120fe46..9df71a765ebe 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_service/transports/rest_base.py @@ -14,21 +14,23 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SampleQueryServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format -from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import import_config from google.cloud.discoveryengine_v1beta.types import sample_query +from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import sample_query_service - -from .base import DEFAULT_CLIENT_INFO, SampleQueryServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseSampleQueryServiceRestTransport(SampleQueryServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/__init__.py index 60ef15e648d4..1df99a2b1309 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SampleQuerySetServiceAsyncClient from .client import SampleQuerySetServiceClient +from .async_client import SampleQuerySetServiceAsyncClient __all__ = ( "SampleQuerySetServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py index f7068c5d8516..b62c44ffa76e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,36 +29,35 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import pagers +from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import sample_query_set_service - -from .client import SampleQuerySetServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SampleQuerySetServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SampleQuerySetServiceGrpcAsyncIOTransport +from .client import SampleQuerySetServiceClient try: from google.api_core import client_logging # type: ignore @@ -132,7 +131,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_info.__func__(SampleQuerySetServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SampleQuerySetServiceClient.from_service_account_info.__func__( + SampleQuerySetServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +149,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SampleQuerySetServiceAsyncClient: The constructed client. """ - return SampleQuerySetServiceClient.from_service_account_file.__func__(SampleQuerySetServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SampleQuerySetServiceClient.from_service_account_file.__func__( + SampleQuerySetServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -186,7 +189,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SampleQuerySetServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SampleQuerySetServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py index 436506bd265a..c30613bb6997 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,19 +61,17 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import pagers +from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import sample_query_set_service - -from .transports.base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SampleQuerySetServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SampleQuerySetServiceGrpcTransport from .transports.grpc_asyncio import SampleQuerySetServiceGrpcAsyncIOTransport from .transports.rest import SampleQuerySetServiceRestTransport @@ -87,9 +85,7 @@ class SampleQuerySetServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SampleQuerySetServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport @@ -636,11 +632,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SampleQuerySetServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SampleQuerySetServiceClient._read_environment_variables() + ) self._client_cert_source = SampleQuerySetServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -675,8 +669,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SampleQuerySetServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py index fd027cc1e28d..44f92a6ced04 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,10 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - sample_query_set, - sample_query_set_service, -) +from google.cloud.discoveryengine_v1beta.types import sample_query_set +from google.cloud.discoveryengine_v1beta.types import sample_query_set_service class ListSampleQuerySetsPager: @@ -70,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py index 44ad1aa56225..720035d6d52d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import SampleQuerySetServiceTransport from .grpc import SampleQuerySetServiceGrpcTransport from .grpc_asyncio import SampleQuerySetServiceGrpcAsyncIOTransport -from .rest import ( - SampleQuerySetServiceRestInterceptor, - SampleQuerySetServiceRestTransport, -) +from .rest import SampleQuerySetServiceRestTransport +from .rest import SampleQuerySetServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SampleQuerySetServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SampleQuerySetServiceTransport]] _transport_registry["grpc"] = SampleQuerySetServiceGrpcTransport _transport_registry["grpc_asyncio"] = SampleQuerySetServiceGrpcAsyncIOTransport _transport_registry["rest"] = SampleQuerySetServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py index 0f9223c7aa91..0bfccfe17b2f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/base.py @@ -16,24 +16,25 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import sample_query_set_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -271,7 +272,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py index 2040ee5d6e13..4950f284614a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc.py @@ -16,28 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import sample_query_set_service - -from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SampleQuerySetServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py index 8c4096140d25..2e6a096b41b8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/grpc_asyncio.py @@ -15,32 +15,33 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore +from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import sample_query_set_service - -from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SampleQuerySetServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SampleQuerySetServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py index 070b534d65a6..c9ef3dec6adb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest.py @@ -13,32 +13,38 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import sample_query_set_service +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSampleQuerySetServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -565,9 +571,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCreateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_create_sample_query_set( request, metadata @@ -719,9 +723,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseDeleteSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_delete_sample_query_set( request, metadata @@ -840,9 +842,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_get_sample_query_set( request, metadata @@ -994,9 +994,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListSampleQuerySets._get_http_options() request, metadata = self._interceptor.pre_list_sample_query_sets( request, metadata @@ -1154,9 +1152,7 @@ def __call__( """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseUpdateSampleQuerySet._get_http_options() request, metadata = self._interceptor.pre_update_sample_query_set( request, metadata @@ -1365,9 +1361,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1490,9 +1484,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1631,9 +1623,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSampleQuerySetServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py index 15a4ee567698..1f5b0cc1147a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/sample_query_set_service/transports/rest_base.py @@ -14,22 +14,24 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SampleQuerySetServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format +from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import sample_query_set_service - -from .base import DEFAULT_CLIENT_INFO, SampleQuerySetServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseSampleQuerySetServiceRestTransport(SampleQuerySetServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/__init__.py index f95513aefa30..0908014e8c82 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SchemaServiceAsyncClient from .client import SchemaServiceClient +from .async_client import SchemaServiceAsyncClient __all__ = ( "SchemaServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py index 5b52e5dfa060..3459dd860f53 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,19 +47,17 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.schema_service import pagers from google.cloud.discoveryengine_v1beta.types import schema from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema from google.cloud.discoveryengine_v1beta.types import schema_service - -from .client import SchemaServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from .transports.base import SchemaServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SchemaServiceGrpcAsyncIOTransport +from .client import SchemaServiceClient try: from google.api_core import client_logging # type: ignore @@ -126,7 +125,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_info.__func__(SchemaServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SchemaServiceClient.from_service_account_info.__func__( + SchemaServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -142,7 +143,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SchemaServiceAsyncClient: The constructed client. """ - return SchemaServiceClient.from_service_account_file.__func__(SchemaServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SchemaServiceClient.from_service_account_file.__func__( + SchemaServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py index 16b56a1408b1..6e945cdaf094 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,17 +63,15 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.schema_service import pagers from google.cloud.discoveryengine_v1beta.types import schema from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema from google.cloud.discoveryengine_v1beta.types import schema_service - -from .transports.base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from .transports.base import SchemaServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SchemaServiceGrpcTransport from .transports.grpc_asyncio import SchemaServiceGrpcAsyncIOTransport from .transports.rest import SchemaServiceRestTransport @@ -635,11 +633,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SchemaServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SchemaServiceClient._read_environment_variables() + ) self._client_cert_source = SchemaServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -674,8 +670,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SchemaServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py index 3e571974fcfc..57b4e3b6c065 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,7 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import schema, schema_service +from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema_service class ListSchemasPager: @@ -67,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +143,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/__init__.py index d21d5baa6100..78c2fa21d683 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import SchemaServiceTransport from .grpc import SchemaServiceGrpcTransport from .grpc_asyncio import SchemaServiceGrpcAsyncIOTransport -from .rest import SchemaServiceRestInterceptor, SchemaServiceRestTransport +from .rest import SchemaServiceRestTransport +from .rest import SchemaServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[SchemaServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py index ff00c1467071..9c7eccc860f4 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/base.py @@ -16,19 +16,22 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import schema, schema_service +from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -263,7 +266,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py index 3bb625e3288e..094bfa69211f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc.py @@ -16,23 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import schema, schema_service - -from .base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py index bf4829dc9442..a582466e3d0f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/grpc_asyncio.py @@ -15,27 +15,30 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1beta.types import schema, schema_service - -from .base import DEFAULT_CLIENT_INFO, SchemaServiceTransport +from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SchemaServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py index 872adb10c4ac..1ee439a3a452 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest.py @@ -13,27 +13,35 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta.types import schema, schema_service -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSchemaServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest_base.py index 3a9db40ff9e4..2181355873a6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/schema_service/transports/rest_base.py @@ -14,17 +14,20 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SchemaServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1beta.types import schema, schema_service +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, SchemaServiceTransport + +from google.cloud.discoveryengine_v1beta.types import schema +from google.cloud.discoveryengine_v1beta.types import schema_service +from google.longrunning import operations_pb2 # type: ignore class _BaseSchemaServiceRestTransport(SchemaServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/__init__.py index 96aaa3993300..2be7ab3ff9b0 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SearchServiceAsyncClient from .client import SearchServiceClient +from .async_client import SearchServiceAsyncClient __all__ = ( "SearchServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py index 9152e7214767..7d2676060217 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,30 +29,29 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.search_service import pagers from google.cloud.discoveryengine_v1beta.types import search_service - -from .client import SearchServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .transports.base import SearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SearchServiceGrpcAsyncIOTransport +from .client import SearchServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +127,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_info.__func__(SearchServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SearchServiceClient.from_service_account_info.__func__( + SearchServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchServiceAsyncClient: The constructed client. """ - return SearchServiceClient.from_service_account_file.__func__(SearchServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SearchServiceClient.from_service_account_file.__func__( + SearchServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py index e4106c33b092..68c1dc459c2c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,13 +61,11 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.search_service import pagers from google.cloud.discoveryengine_v1beta.types import search_service - -from .transports.base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .transports.base import SearchServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SearchServiceGrpcTransport from .transports.grpc_asyncio import SearchServiceGrpcAsyncIOTransport from .transports.rest import SearchServiceRestTransport @@ -729,11 +727,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchServiceClient._read_environment_variables() + ) self._client_cert_source = SearchServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -768,8 +764,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py index 245dd7f9e21d..ca501a3413a1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -67,7 +66,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -143,7 +142,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -223,7 +222,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -299,7 +298,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/__init__.py index 24f3c65a62e4..62c175446415 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import SearchServiceTransport from .grpc import SearchServiceGrpcTransport from .grpc_asyncio import SearchServiceGrpcAsyncIOTransport -from .rest import SearchServiceRestInterceptor, SearchServiceRestTransport +from .rest import SearchServiceRestTransport +from .rest import SearchServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[SearchServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py index 4187306b54a8..41bb1c9d7eec 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/base.py @@ -16,19 +16,20 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import search_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -213,7 +214,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py index f19b576030c2..4a0ecae02d85 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc.py @@ -16,23 +16,24 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_service - -from .base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py index c6e20c6cd93a..3b382565ae84 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/grpc_asyncio.py @@ -15,27 +15,28 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1beta.types import search_service - -from .base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SearchServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py index c46e4a992fed..c5deacaef0d6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest.py @@ -13,27 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1beta.types import search_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSearchServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest_base.py index 3bd803b21e94..76038f29c7d9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SearchServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1beta.types import search_service - -from .base import DEFAULT_CLIENT_INFO, SearchServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseSearchServiceRestTransport(SearchServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/__init__.py index 1759c51ec4ab..6b603bf03c01 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SearchTuningServiceAsyncClient from .client import SearchTuningServiceClient +from .async_client import SearchTuningServiceAsyncClient __all__ = ( "SearchTuningServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py index 1aa612514291..3c1c00bb54bb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,17 +47,13 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.types import custom_tuning_model +from google.cloud.discoveryengine_v1beta.types import search_tuning_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import ( - custom_tuning_model, - search_tuning_service, -) - -from .client import SearchTuningServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from .transports.base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SearchTuningServiceGrpcAsyncIOTransport +from .client import SearchTuningServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +125,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_info.__func__(SearchTuningServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SearchTuningServiceClient.from_service_account_info.__func__( + SearchTuningServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +143,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SearchTuningServiceAsyncClient: The constructed client. """ - return SearchTuningServiceClient.from_service_account_file.__func__(SearchTuningServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SearchTuningServiceClient.from_service_account_file.__func__( + SearchTuningServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -182,7 +183,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SearchTuningServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SearchTuningServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py index 1fc8d798c2e0..06b9b7b74afc 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,15 +63,11 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.types import custom_tuning_model +from google.cloud.discoveryengine_v1beta.types import search_tuning_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import ( - custom_tuning_model, - search_tuning_service, -) - -from .transports.base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from .transports.base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SearchTuningServiceGrpcTransport from .transports.grpc_asyncio import SearchTuningServiceGrpcAsyncIOTransport from .transports.rest import SearchTuningServiceRestTransport @@ -85,9 +81,7 @@ class SearchTuningServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SearchTuningServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport @@ -637,11 +631,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SearchTuningServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SearchTuningServiceClient._read_environment_variables() + ) self._client_cert_source = SearchTuningServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -676,8 +668,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SearchTuningServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py index d759f5c3cdcd..a1d0aa1f0e9f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/__init__.py @@ -19,12 +19,12 @@ from .base import SearchTuningServiceTransport from .grpc import SearchTuningServiceGrpcTransport from .grpc_asyncio import SearchTuningServiceGrpcAsyncIOTransport -from .rest import SearchTuningServiceRestInterceptor, SearchTuningServiceRestTransport +from .rest import SearchTuningServiceRestTransport +from .rest import SearchTuningServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SearchTuningServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SearchTuningServiceTransport]] _transport_registry["grpc"] = SearchTuningServiceGrpcTransport _transport_registry["grpc_asyncio"] = SearchTuningServiceGrpcAsyncIOTransport _transport_registry["rest"] = SearchTuningServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py index 459fc70e6947..32d6ddfe2bc2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/base.py @@ -16,19 +16,21 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import search_tuning_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -221,7 +223,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py index 78eaf2b5a2e1..f9ca014fd8c7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc.py @@ -16,23 +16,25 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_tuning_service - -from .base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py index 07fc4b8e2137..01f651e30612 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/grpc_asyncio.py @@ -15,27 +15,29 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1beta.types import search_tuning_service - -from .base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SearchTuningServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py index c55d14440fc4..f9e2d9b2bdb6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest.py @@ -13,27 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1beta.types import search_tuning_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSearchTuningServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -583,9 +590,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListCustomModels._get_http_options() request, metadata = self._interceptor.pre_list_custom_models( request, metadata @@ -738,9 +743,7 @@ def __call__( """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseTrainCustomModel._get_http_options() request, metadata = self._interceptor.pre_train_custom_model( request, metadata @@ -910,9 +913,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1033,9 +1034,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1174,9 +1173,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSearchTuningServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest_base.py index a62f9642ae9e..a1f09fff206a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/search_tuning_service/transports/rest_base.py @@ -14,17 +14,19 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SearchTuningServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1beta.types import search_tuning_service - -from .base import DEFAULT_CLIENT_INFO, SearchTuningServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseSearchTuningServiceRestTransport(SearchTuningServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/__init__.py index 5e424baa78b8..123f6508d9a5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import ServingConfigServiceAsyncClient from .client import ServingConfigServiceClient +from .async_client import ServingConfigServiceAsyncClient __all__ = ( "ServingConfigServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py index f25cafc4960d..07c46d80f92a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,37 +29,37 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import search_service +from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import common, search_service -from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import serving_config_service - -from .client import ServingConfigServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import ServingConfigServiceGrpcAsyncIOTransport +from .client import ServingConfigServiceClient try: from google.api_core import client_logging # type: ignore @@ -127,7 +127,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_info.__func__(ServingConfigServiceAsyncClient, info, *args, **kwargs) # type: ignore + return ServingConfigServiceClient.from_service_account_info.__func__( + ServingConfigServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -143,7 +145,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: ServingConfigServiceAsyncClient: The constructed client. """ - return ServingConfigServiceClient.from_service_account_file.__func__(ServingConfigServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return ServingConfigServiceClient.from_service_account_file.__func__( + ServingConfigServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -181,7 +185,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return ServingConfigServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> ServingConfigServiceTransport: @@ -368,7 +374,7 @@ async def sample_update_serving_config(): [ServingConfig][google.cloud.discoveryengine.v1beta.ServingConfig] to update. The following are NOT supported: - - [ServingConfig.name][google.cloud.discoveryengine.v1beta.ServingConfig.name] + - [ServingConfig.name][google.cloud.discoveryengine.v1beta.ServingConfig.name] If not set, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py index 37816e60c234..3ac10d9e6cf8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,20 +61,19 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import search_service +from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import common, search_service -from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import serving_config_service - -from .transports.base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import ServingConfigServiceGrpcTransport from .transports.grpc_asyncio import ServingConfigServiceGrpcAsyncIOTransport from .transports.rest import ServingConfigServiceRestTransport @@ -88,9 +87,7 @@ class ServingConfigServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[ServingConfigServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport @@ -620,11 +617,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = ServingConfigServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + ServingConfigServiceClient._read_environment_variables() + ) self._client_cert_source = ServingConfigServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -659,8 +654,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(ServingConfigServiceTransport, transport) self._api_endpoint = self._transport.host @@ -792,7 +786,7 @@ def sample_update_serving_config(): [ServingConfig][google.cloud.discoveryengine.v1beta.ServingConfig] to update. The following are NOT supported: - - [ServingConfig.name][google.cloud.discoveryengine.v1beta.ServingConfig.name] + - [ServingConfig.name][google.cloud.discoveryengine.v1beta.ServingConfig.name] If not set, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py index d21bb5f36c17..da6affe135b5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,10 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - serving_config, - serving_config_service, -) +from google.cloud.discoveryengine_v1beta.types import serving_config +from google.cloud.discoveryengine_v1beta.types import serving_config_service class ListServingConfigsPager: @@ -70,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py index 6bdd4697d637..21e7b3091b0a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/__init__.py @@ -19,12 +19,12 @@ from .base import ServingConfigServiceTransport from .grpc import ServingConfigServiceGrpcTransport from .grpc_asyncio import ServingConfigServiceGrpcAsyncIOTransport -from .rest import ServingConfigServiceRestInterceptor, ServingConfigServiceRestTransport +from .rest import ServingConfigServiceRestTransport +from .rest import ServingConfigServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[ServingConfigServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[ServingConfigServiceTransport]] _transport_registry["grpc"] = ServingConfigServiceGrpcTransport _transport_registry["grpc_asyncio"] = ServingConfigServiceGrpcAsyncIOTransport _transport_registry["rest"] = ServingConfigServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py index 06a1d4ddb0d7..69c26439846a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/base.py @@ -16,23 +16,24 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version +from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import serving_config_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -237,7 +238,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py index 4da66aaf6a85..ac75c0afd5db 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc.py @@ -16,27 +16,28 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import serving_config_service - -from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py index f4a00d16bf7e..e6cee5c83493 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/grpc_asyncio.py @@ -15,31 +15,32 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore +from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import serving_config_service - -from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO from .grpc import ServingConfigServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py index 8703bf54329f..3c5d1050afcf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest.py @@ -13,31 +13,37 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + +from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import serving_config_service +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseServingConfigServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -483,9 +489,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetServingConfig._get_http_options() request, metadata = self._interceptor.pre_get_serving_config( request, metadata @@ -635,9 +639,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListServingConfigs._get_http_options() request, metadata = self._interceptor.pre_list_serving_configs( request, metadata @@ -796,9 +798,7 @@ def __call__( """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseUpdateServingConfig._get_http_options() request, metadata = self._interceptor.pre_update_serving_config( request, metadata @@ -985,9 +985,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1108,9 +1106,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -1249,9 +1245,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseServingConfigServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseServingConfigServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py index 07249d539623..4ead44ab0251 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/serving_config_service/transports/rest_base.py @@ -14,21 +14,23 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import ServingConfigServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format +from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import serving_config_service - -from .base import DEFAULT_CLIENT_INFO, ServingConfigServiceTransport +from google.longrunning import operations_pb2 # type: ignore class _BaseServingConfigServiceRestTransport(ServingConfigServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/__init__.py index c278fb1603a2..a00026df42c5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SessionServiceAsyncClient from .client import SessionServiceClient +from .async_client import SessionServiceAsyncClient __all__ = ( "SessionServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py index 3e1a745dab83..8b47b2b2c803 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,34 +29,33 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.session_service import pagers from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session - -from .client import SessionServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SessionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SessionServiceGrpcAsyncIOTransport +from .client import SessionServiceClient try: from google.api_core import client_logging # type: ignore @@ -128,7 +127,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_info.__func__(SessionServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SessionServiceClient.from_service_account_info.__func__( + SessionServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -144,7 +145,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SessionServiceAsyncClient: The constructed client. """ - return SessionServiceClient.from_service_account_file.__func__(SessionServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SessionServiceClient.from_service_account_file.__func__( + SessionServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -585,7 +588,7 @@ async def sample_update_session(): [Session][google.cloud.discoveryengine.v1beta.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1beta.Session.name] + - [Session.name][google.cloud.discoveryengine.v1beta.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py index 73766d386aeb..00472b43bf1f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -61,17 +61,15 @@ _LOGGER = std_logging.getLogger(__name__) -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.session_service import pagers from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session - -from .transports.base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from .transports.base import SessionServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SessionServiceGrpcTransport from .transports.grpc_asyncio import SessionServiceGrpcAsyncIOTransport from .transports.rest import SessionServiceRestTransport @@ -85,9 +83,7 @@ class SessionServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SessionServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] _transport_registry["grpc"] = SessionServiceGrpcTransport _transport_registry["grpc_asyncio"] = SessionServiceGrpcAsyncIOTransport _transport_registry["rest"] = SessionServiceRestTransport @@ -713,11 +709,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SessionServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SessionServiceClient._read_environment_variables() + ) self._client_cert_source = SessionServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -752,8 +746,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SessionServiceTransport, transport) self._api_endpoint = self._transport.host @@ -1098,7 +1091,7 @@ def sample_update_session(): [Session][google.cloud.discoveryengine.v1beta.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1beta.Session.name] + - [Session.name][google.cloud.discoveryengine.v1beta.Session.name] If not set or empty, all supported fields are updated. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py index 519fa65bf54d..f394bbbd90a1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,10 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - conversational_search_service, - session, -) +from google.cloud.discoveryengine_v1beta.types import conversational_search_service +from google.cloud.discoveryengine_v1beta.types import session class ListSessionsPager: @@ -70,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/__init__.py index d258a984225b..541203cdd07f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import SessionServiceTransport from .grpc import SessionServiceGrpcTransport from .grpc_asyncio import SessionServiceGrpcAsyncIOTransport -from .rest import SessionServiceRestInterceptor, SessionServiceRestTransport +from .rest import SessionServiceRestTransport +from .rest import SessionServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[SessionServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py index b1ab7e717b39..8659e7f0db55 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/base.py @@ -16,22 +16,23 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.protobuf import empty_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta import gapic_version as package_version from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -261,7 +262,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py index 68804799730f..ede90c0fcd28 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc.py @@ -16,26 +16,27 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers +from google.api_core import grpc_helpers +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SessionServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py index 7e0ce89dfce1..e3804ba89d54 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/grpc_asyncio.py @@ -15,30 +15,31 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from google.protobuf import empty_pb2 # type: ignore +from .base import SessionServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SessionServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py index b79c12438bfe..db38d1ea6aab 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest.py @@ -13,30 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, rest_helpers, rest_streaming from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf -from google.protobuf import empty_pb2 # type: ignore + from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore + -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSessionServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -1292,9 +1298,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSessionServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py index 4da0f0a14e8f..556dc0df4b83 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/session_service/transports/rest_base.py @@ -14,20 +14,22 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SessionServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import json_format from google.cloud.discoveryengine_v1beta.types import conversational_search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session - -from .base import DEFAULT_CLIENT_INFO, SessionServiceTransport +from google.protobuf import empty_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore class _BaseSessionServiceRestTransport(SessionServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/__init__.py index 8039b8753159..3bffbf62365f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import SiteSearchEngineServiceAsyncClient from .client import SiteSearchEngineServiceClient +from .async_client import SiteSearchEngineServiceAsyncClient __all__ = ( "SiteSearchEngineServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py index 89b86b5877ec..3d4712bff615 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -46,22 +47,18 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( + pagers, +) +from google.cloud.discoveryengine_v1beta.types import site_search_engine +from google.cloud.discoveryengine_v1beta.types import site_search_engine_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( - pagers, -) -from google.cloud.discoveryengine_v1beta.types import ( - site_search_engine, - site_search_engine_service, -) - -from .client import SiteSearchEngineServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from .transports.base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import SiteSearchEngineServiceGrpcAsyncIOTransport +from .client import SiteSearchEngineServiceClient try: from google.api_core import client_logging # type: ignore @@ -141,7 +138,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_info.__func__(SiteSearchEngineServiceAsyncClient, info, *args, **kwargs) # type: ignore + return SiteSearchEngineServiceClient.from_service_account_info.__func__( + SiteSearchEngineServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -157,7 +156,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: SiteSearchEngineServiceAsyncClient: The constructed client. """ - return SiteSearchEngineServiceClient.from_service_account_file.__func__(SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return SiteSearchEngineServiceClient.from_service_account_file.__func__( + SiteSearchEngineServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file @@ -195,7 +196,9 @@ def get_mtls_endpoint_and_cert_source( Raises: google.auth.exceptions.MutualTLSChannelError: If any errors happen. """ - return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source(client_options) # type: ignore + return SiteSearchEngineServiceClient.get_mtls_endpoint_and_cert_source( + client_options + ) # type: ignore @property def transport(self) -> SiteSearchEngineServiceTransport: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py index e79f570058da..7518f0264adf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -63,20 +63,16 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( + pagers, +) +from google.cloud.discoveryengine_v1beta.types import site_search_engine +from google.cloud.discoveryengine_v1beta.types import site_search_engine_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( - pagers, -) -from google.cloud.discoveryengine_v1beta.types import ( - site_search_engine, - site_search_engine_service, -) - -from .transports.base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from .transports.base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import SiteSearchEngineServiceGrpcTransport from .transports.grpc_asyncio import SiteSearchEngineServiceGrpcAsyncIOTransport from .transports.rest import SiteSearchEngineServiceRestTransport @@ -90,9 +86,7 @@ class SiteSearchEngineServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport @@ -668,11 +662,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = SiteSearchEngineServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + SiteSearchEngineServiceClient._read_environment_variables() + ) self._client_cert_source = ( SiteSearchEngineServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert @@ -709,8 +701,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(SiteSearchEngineServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py index e9d54b6c0c8f..0842ccafce6c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/pagers.py @@ -13,22 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.api_core import gapic_v1 +from google.api_core import retry as retries +from google.api_core import retry_async as retries_async from typing import ( Any, AsyncIterator, Awaitable, Callable, - Iterator, - Optional, Sequence, Tuple, + Optional, + Iterator, Union, ) -from google.api_core import gapic_v1 -from google.api_core import retry as retries -from google.api_core import retry_async as retries_async - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] OptionalAsyncRetry = Union[ @@ -38,10 +37,8 @@ OptionalRetry = Union[retries.Retry, object, None] # type: ignore OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None] # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - site_search_engine, - site_search_engine_service, -) +from google.cloud.discoveryengine_v1beta.types import site_search_engine +from google.cloud.discoveryengine_v1beta.types import site_search_engine_service class ListTargetSitesPager: @@ -70,7 +67,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -148,7 +145,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. @@ -232,7 +229,7 @@ def __init__( *, retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiate the pager. @@ -315,7 +312,7 @@ def __init__( *, retry: OptionalAsyncRetry = gapic_v1.method.DEFAULT, timeout: Union[float, object] = gapic_v1.method.DEFAULT, - metadata: Sequence[Tuple[str, Union[str, bytes]]] = () + metadata: Sequence[Tuple[str, Union[str, bytes]]] = (), ): """Instantiates the pager. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py index 5443c0c10cf1..31f1983d1847 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/__init__.py @@ -19,15 +19,12 @@ from .base import SiteSearchEngineServiceTransport from .grpc import SiteSearchEngineServiceGrpcTransport from .grpc_asyncio import SiteSearchEngineServiceGrpcAsyncIOTransport -from .rest import ( - SiteSearchEngineServiceRestInterceptor, - SiteSearchEngineServiceRestTransport, -) +from .rest import SiteSearchEngineServiceRestTransport +from .rest import SiteSearchEngineServiceRestInterceptor + # Compile a registry of transports. -_transport_registry = ( - OrderedDict() -) # type: Dict[str, Type[SiteSearchEngineServiceTransport]] +_transport_registry = OrderedDict() # type: Dict[str, Type[SiteSearchEngineServiceTransport]] _transport_registry["grpc"] = SiteSearchEngineServiceGrpcTransport _transport_registry["grpc_asyncio"] = SiteSearchEngineServiceGrpcAsyncIOTransport _transport_registry["rest"] = SiteSearchEngineServiceRestTransport diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py index 3cccda29f9c1..de25eab9bf06 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/base.py @@ -16,22 +16,22 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import ( - site_search_engine, - site_search_engine_service, -) +from google.cloud.discoveryengine_v1beta.types import site_search_engine +from google.cloud.discoveryengine_v1beta.types import site_search_engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -415,7 +415,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py index 529aa4ed06cf..2b715c05df4f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc.py @@ -16,26 +16,26 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - site_search_engine, - site_search_engine_service, -) - -from .base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from google.cloud.discoveryengine_v1beta.types import site_search_engine +from google.cloud.discoveryengine_v1beta.types import site_search_engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore @@ -661,12 +661,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -693,12 +693,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -786,12 +786,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py index 3416e87016f7..7f15901d9496 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/grpc_asyncio.py @@ -15,30 +15,30 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - site_search_engine, - site_search_engine_service, -) - -from .base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport +from google.cloud.discoveryengine_v1beta.types import site_search_engine +from google.cloud.discoveryengine_v1beta.types import site_search_engine_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO from .grpc import SiteSearchEngineServiceGrpcTransport try: @@ -675,12 +675,12 @@ def enable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "enable_advanced_site_search" not in self._stubs: - self._stubs[ - "enable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", - request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["enable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/EnableAdvancedSiteSearch", + request_serializer=site_search_engine_service.EnableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["enable_advanced_site_search"] @@ -707,12 +707,12 @@ def disable_advanced_site_search( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "disable_advanced_site_search" not in self._stubs: - self._stubs[ - "disable_advanced_site_search" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", - request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, - response_deserializer=operations_pb2.Operation.FromString, + self._stubs["disable_advanced_site_search"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/DisableAdvancedSiteSearch", + request_serializer=site_search_engine_service.DisableAdvancedSiteSearchRequest.serialize, + response_deserializer=operations_pb2.Operation.FromString, + ) ) return self._stubs["disable_advanced_site_search"] @@ -801,12 +801,12 @@ def fetch_domain_verification_status( # gRPC handles serialization and deserialization, so we just need # to pass in the functions for each. if "fetch_domain_verification_status" not in self._stubs: - self._stubs[ - "fetch_domain_verification_status" - ] = self._logged_channel.unary_unary( - "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", - request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, - response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + self._stubs["fetch_domain_verification_status"] = ( + self._logged_channel.unary_unary( + "/google.cloud.discoveryengine.v1beta.SiteSearchEngineService/FetchDomainVerificationStatus", + request_serializer=site_search_engine_service.FetchDomainVerificationStatusRequest.serialize, + response_deserializer=site_search_engine_service.FetchDomainVerificationStatusResponse.deserialize, + ) ) return self._stubs["fetch_domain_verification_status"] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py index cc9775658ae3..d863b323cf63 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest.py @@ -13,30 +13,35 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.cloud.discoveryengine_v1beta.types import site_search_engine +from google.cloud.discoveryengine_v1beta.types import site_search_engine_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - site_search_engine, - site_search_engine_service, -) -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseSiteSearchEngineServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -1336,9 +1341,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchCreateTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_create_target_sites( request, metadata @@ -1492,9 +1495,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseBatchVerifyTargetSites._get_http_options() request, metadata = self._interceptor.pre_batch_verify_target_sites( request, metadata @@ -1648,9 +1649,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_http_options() request, metadata = self._interceptor.pre_create_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseCreateSitemap._get_transcoded_request( @@ -1804,9 +1803,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCreateTargetSite._get_http_options() request, metadata = self._interceptor.pre_create_target_site( request, metadata @@ -1961,9 +1958,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_http_options() request, metadata = self._interceptor.pre_delete_sitemap(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteSitemap._get_transcoded_request( @@ -2111,9 +2106,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDeleteTargetSite._get_http_options() request, metadata = self._interceptor.pre_delete_target_site( request, metadata @@ -2267,9 +2260,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseDisableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_disable_advanced_site_search( request, metadata @@ -2424,9 +2415,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseEnableAdvancedSiteSearch._get_http_options() request, metadata = self._interceptor.pre_enable_advanced_site_search( request, metadata @@ -2582,9 +2571,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchDomainVerificationStatus._get_http_options() request, metadata = self._interceptor.pre_fetch_domain_verification_status( request, metadata @@ -2652,11 +2639,10 @@ def __call__( resp = self._interceptor.post_fetch_domain_verification_status(resp) response_metadata = [(k, str(v)) for k, v in response.headers.items()] - ( - resp, - _, - ) = self._interceptor.post_fetch_domain_verification_status_with_metadata( - resp, response_metadata + resp, _ = ( + self._interceptor.post_fetch_domain_verification_status_with_metadata( + resp, response_metadata + ) ) if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor( logging.DEBUG @@ -2743,9 +2729,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_http_options() request, metadata = self._interceptor.pre_fetch_sitemaps(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseFetchSitemaps._get_transcoded_request( @@ -2900,9 +2884,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetSiteSearchEngine._get_http_options() request, metadata = self._interceptor.pre_get_site_search_engine( request, metadata @@ -3055,9 +3037,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_http_options() request, metadata = self._interceptor.pre_get_target_site(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetTargetSite._get_transcoded_request( @@ -3207,9 +3187,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListTargetSites._get_http_options() request, metadata = self._interceptor.pre_list_target_sites( request, metadata @@ -3366,9 +3344,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_http_options() request, metadata = self._interceptor.pre_recrawl_uris(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseRecrawlUris._get_transcoded_request( @@ -3520,9 +3496,7 @@ def __call__( """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseUpdateTargetSite._get_http_options() request, metadata = self._interceptor.pre_update_target_site( request, metadata @@ -3626,7 +3600,9 @@ def batch_create_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchCreateTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchCreateTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def batch_verify_target_sites( @@ -3637,7 +3613,9 @@ def batch_verify_target_sites( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._BatchVerifyTargetSites(self._session, self._host, self._interceptor) # type: ignore + return self._BatchVerifyTargetSites( + self._session, self._host, self._interceptor + ) # type: ignore @property def create_sitemap( @@ -3688,7 +3666,9 @@ def disable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._DisableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._DisableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def enable_advanced_site_search( @@ -3699,7 +3679,9 @@ def enable_advanced_site_search( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._EnableAdvancedSiteSearch(self._session, self._host, self._interceptor) # type: ignore + return self._EnableAdvancedSiteSearch( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_domain_verification_status( @@ -3710,7 +3692,9 @@ def fetch_domain_verification_status( ]: # The return type is fine, but mypy isn't sophisticated enough to determine what's going on here. # In C++ this would require a dynamic_cast - return self._FetchDomainVerificationStatus(self._session, self._host, self._interceptor) # type: ignore + return self._FetchDomainVerificationStatus( + self._session, self._host, self._interceptor + ) # type: ignore @property def fetch_sitemaps( @@ -3831,9 +3815,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -3956,9 +3938,7 @@ def __call__( operations_pb2.Operation: Response from GetOperation method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_http_options() request, metadata = self._interceptor.pre_get_operation(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseGetOperation._get_transcoded_request( @@ -4097,9 +4077,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseSiteSearchEngineServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest_base.py index 4bdd85cce4fb..2a282b2f71ca 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/site_search_engine_service/transports/rest_base.py @@ -14,20 +14,20 @@ # limitations under the License. # import json # type: ignore -import re -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +from google.api_core import path_template +from google.api_core import gapic_v1 -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import SiteSearchEngineServiceTransport, DEFAULT_CLIENT_INFO -from google.cloud.discoveryengine_v1beta.types import ( - site_search_engine, - site_search_engine_service, -) +import re +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -from .base import DEFAULT_CLIENT_INFO, SiteSearchEngineServiceTransport + +from google.cloud.discoveryengine_v1beta.types import site_search_engine +from google.cloud.discoveryengine_v1beta.types import site_search_engine_service +from google.longrunning import operations_pb2 # type: ignore class _BaseSiteSearchEngineServiceRestTransport(SiteSearchEngineServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/__init__.py index eea5da67c013..4c45751a520f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .async_client import UserEventServiceAsyncClient from .client import UserEventServiceClient +from .async_client import UserEventServiceAsyncClient __all__ = ( "UserEventServiceClient", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py index 44ca653a5bfc..ccdc90ae6c1f 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/async_client.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from collections import OrderedDict import logging as std_logging +from collections import OrderedDict import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -29,15 +29,16 @@ Union, ) +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +from google.api_core.client_options import ClientOptions from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry_async as retries -from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version try: OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None] @@ -47,22 +48,18 @@ from google.api import httpbody_pb2 # type: ignore from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.discoveryengine_v1beta.types import user_event +from google.cloud.discoveryengine_v1beta.types import user_event_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import any_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import ( - common, - import_config, - purge_config, - user_event, - user_event_service, -) - -from .client import UserEventServiceClient -from .transports.base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from .transports.base import UserEventServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc_asyncio import UserEventServiceGrpcAsyncIOTransport +from .client import UserEventServiceClient try: from google.api_core import client_logging # type: ignore @@ -132,7 +129,9 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_info.__func__(UserEventServiceAsyncClient, info, *args, **kwargs) # type: ignore + return UserEventServiceClient.from_service_account_info.__func__( + UserEventServiceAsyncClient, info, *args, **kwargs + ) # type: ignore @classmethod def from_service_account_file(cls, filename: str, *args, **kwargs): @@ -148,7 +147,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): Returns: UserEventServiceAsyncClient: The constructed client. """ - return UserEventServiceClient.from_service_account_file.__func__(UserEventServiceAsyncClient, filename, *args, **kwargs) # type: ignore + return UserEventServiceClient.from_service_account_file.__func__( + UserEventServiceAsyncClient, filename, *args, **kwargs + ) # type: ignore from_service_account_json = from_service_account_file diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py index 6b36cdf5a50c..b63cf05ae9df 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/client.py @@ -20,8 +20,8 @@ import os import re from typing import ( - Callable, Dict, + Callable, Mapping, MutableMapping, MutableSequence, @@ -34,19 +34,19 @@ ) import warnings +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore +from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version - try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] except AttributeError: # pragma: NO COVER @@ -64,20 +64,16 @@ from google.api import httpbody_pb2 # type: ignore from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.discoveryengine_v1beta.types import user_event +from google.cloud.discoveryengine_v1beta.types import user_event_service from google.cloud.location import locations_pb2 # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.protobuf import any_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore - -from google.cloud.discoveryengine_v1beta.types import ( - common, - import_config, - purge_config, - user_event, - user_event_service, -) - -from .transports.base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from .transports.base import UserEventServiceTransport, DEFAULT_CLIENT_INFO from .transports.grpc import UserEventServiceGrpcTransport from .transports.grpc_asyncio import UserEventServiceGrpcAsyncIOTransport from .transports.rest import UserEventServiceRestTransport @@ -91,9 +87,7 @@ class UserEventServiceClientMeta(type): objects. """ - _transport_registry = ( - OrderedDict() - ) # type: Dict[str, Type[UserEventServiceTransport]] + _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] _transport_registry["grpc"] = UserEventServiceGrpcTransport _transport_registry["grpc_asyncio"] = UserEventServiceGrpcAsyncIOTransport _transport_registry["rest"] = UserEventServiceRestTransport @@ -669,11 +663,9 @@ def __init__( universe_domain_opt = getattr(self._client_options, "universe_domain", None) - ( - self._use_client_cert, - self._use_mtls_endpoint, - self._universe_domain_env, - ) = UserEventServiceClient._read_environment_variables() + self._use_client_cert, self._use_mtls_endpoint, self._universe_domain_env = ( + UserEventServiceClient._read_environment_variables() + ) self._client_cert_source = UserEventServiceClient._get_client_cert_source( self._client_options.client_cert_source, self._use_client_cert ) @@ -708,8 +700,7 @@ def __init__( ) if self._client_options.scopes: raise ValueError( - "When providing a transport instance, provide its scopes " - "directly." + "When providing a transport instance, provide its scopes directly." ) self._transport = cast(UserEventServiceTransport, transport) self._api_endpoint = self._transport.host diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/__init__.py index 771ec74658ec..d136d6cf3abb 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/__init__.py @@ -19,7 +19,9 @@ from .base import UserEventServiceTransport from .grpc import UserEventServiceGrpcTransport from .grpc_asyncio import UserEventServiceGrpcAsyncIOTransport -from .rest import UserEventServiceRestInterceptor, UserEventServiceRestTransport +from .rest import UserEventServiceRestTransport +from .rest import UserEventServiceRestInterceptor + # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[UserEventServiceTransport]] diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py index 85d29ea872b5..62be181490ed 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/base.py @@ -16,25 +16,25 @@ import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1beta import gapic_version as package_version + +import google.auth # type: ignore import google.api_core from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, operations_v1 +from google.api_core import gapic_v1 from google.api_core import retry as retries -import google.auth # type: ignore +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore import google.protobuf -from google.cloud.discoveryengine_v1beta import gapic_version as package_version -from google.cloud.discoveryengine_v1beta.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.discoveryengine_v1beta.types import user_event +from google.cloud.discoveryengine_v1beta.types import user_event_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( gapic_version=package_version.__version__ @@ -261,7 +261,10 @@ def get_operation( @property def cancel_operation( self, - ) -> Callable[[operations_pb2.CancelOperationRequest], None,]: + ) -> Callable[ + [operations_pb2.CancelOperationRequest], + None, + ]: raise NotImplementedError() @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py index e03099d5bb01..1e5e767f4e8e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc.py @@ -16,29 +16,29 @@ import json import logging as std_logging import pickle -from typing import Callable, Dict, Optional, Sequence, Tuple, Union import warnings +from typing import Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, grpc_helpers, operations_v1 +from google.api_core import grpc_helpers +from google.api_core import operations_v1 +from google.api_core import gapic_v1 import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) - -from .base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.discoveryengine_v1beta.types import user_event +from google.cloud.discoveryengine_v1beta.types import user_event_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import UserEventServiceTransport, DEFAULT_CLIENT_INFO try: from google.api_core import client_logging # type: ignore diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py index c48cc6540556..c7d091d44d53 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/grpc_asyncio.py @@ -15,33 +15,33 @@ # import inspect import json -import logging as std_logging import pickle -from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union +import logging as std_logging import warnings +from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union -from google.api import httpbody_pb2 # type: ignore +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers_async from google.api_core import exceptions as core_exceptions -from google.api_core import gapic_v1, grpc_helpers_async, operations_v1 from google.api_core import retry_async as retries +from google.api_core import operations_v1 from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore from google.protobuf.json_format import MessageToJson import google.protobuf.message + import grpc # type: ignore -from grpc.experimental import aio # type: ignore import proto # type: ignore +from grpc.experimental import aio # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) - -from .base import DEFAULT_CLIENT_INFO, UserEventServiceTransport +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.discoveryengine_v1beta.types import user_event +from google.cloud.discoveryengine_v1beta.types import user_event_service +from google.cloud.location import locations_pb2 # type: ignore +from google.longrunning import operations_pb2 # type: ignore +from .base import UserEventServiceTransport, DEFAULT_CLIENT_INFO from .grpc import UserEventServiceGrpcTransport try: diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py index e95583803a34..9b0a3f3057bf 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest.py @@ -13,33 +13,38 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import dataclasses -import json # type: ignore import logging -from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union -import warnings +import json # type: ignore -from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, operations_v1, rest_helpers, rest_streaming +from google.auth.transport.requests import AuthorizedSession # type: ignore +from google.auth import credentials as ga_credentials # type: ignore from google.api_core import exceptions as core_exceptions from google.api_core import retry as retries -from google.auth import credentials as ga_credentials # type: ignore -from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.location import locations_pb2 # type: ignore -from google.longrunning import operations_pb2 # type: ignore +from google.api_core import rest_helpers +from google.api_core import rest_streaming +from google.api_core import gapic_v1 import google.protobuf + from google.protobuf import json_format +from google.api_core import operations_v1 +from google.cloud.location import locations_pb2 # type: ignore + from requests import __version__ as requests_version +import dataclasses +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union +import warnings + + +from google.api import httpbody_pb2 # type: ignore +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.discoveryengine_v1beta.types import user_event +from google.cloud.discoveryengine_v1beta.types import user_event_service +from google.longrunning import operations_pb2 # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) -from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO from .rest_base import _BaseUserEventServiceRestTransport +from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None] @@ -744,9 +749,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCollectUserEvent._get_http_options() request, metadata = self._interceptor.pre_collect_user_event( request, metadata @@ -896,9 +899,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseImportUserEvents._get_http_options() request, metadata = self._interceptor.pre_import_user_events( request, metadata @@ -1051,9 +1052,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BasePurgeUserEvents._get_http_options() request, metadata = self._interceptor.pre_purge_user_events( request, metadata @@ -1206,9 +1205,7 @@ def __call__( """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseWriteUserEvent._get_http_options() request, metadata = self._interceptor.pre_write_user_event( request, metadata @@ -1391,9 +1388,7 @@ def __call__( be of type `bytes`. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseCancelOperation._get_http_options() request, metadata = self._interceptor.pre_cancel_operation( request, metadata @@ -1653,9 +1648,7 @@ def __call__( operations_pb2.ListOperationsResponse: Response from ListOperations method. """ - http_options = ( - _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() - ) + http_options = _BaseUserEventServiceRestTransport._BaseListOperations._get_http_options() request, metadata = self._interceptor.pre_list_operations(request, metadata) transcoded_request = _BaseUserEventServiceRestTransport._BaseListOperations._get_transcoded_request( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest_base.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest_base.py index 88b1391c1cf6..8fd3a019de7d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest_base.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/services/user_event_service/transports/rest_base.py @@ -14,23 +14,23 @@ # limitations under the License. # import json # type: ignore +from google.api_core import path_template +from google.api_core import gapic_v1 + +from google.protobuf import json_format +from google.cloud.location import locations_pb2 # type: ignore +from .base import UserEventServiceTransport, DEFAULT_CLIENT_INFO + import re from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union + from google.api import httpbody_pb2 # type: ignore -from google.api_core import gapic_v1, path_template -from google.cloud.location import locations_pb2 # type: ignore +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.discoveryengine_v1beta.types import user_event +from google.cloud.discoveryengine_v1beta.types import user_event_service from google.longrunning import operations_pb2 # type: ignore -from google.protobuf import json_format - -from google.cloud.discoveryengine_v1beta.types import ( - import_config, - purge_config, - user_event, - user_event_service, -) - -from .base import DEFAULT_CLIENT_INFO, UserEventServiceTransport class _BaseUserEventServiceRestTransport(UserEventServiceTransport): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py index c349abe5f20e..f9a28599f4f6 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/__init__.py @@ -13,28 +13,38 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .answer import Answer -from .chunk import Chunk +from .answer import ( + Answer, +) +from .chunk import ( + Chunk, +) from .common import ( CustomAttribute, DoubleList, EmbeddingConfig, - IndustryVertical, Interval, + UserInfo, + IndustryVertical, SearchAddOn, SearchTier, SearchUseCase, SolutionType, - UserInfo, ) -from .completion import CompletionSuggestion, SuggestionDenyListEntry +from .completion import ( + CompletionSuggestion, + SuggestionDenyListEntry, +) from .completion_service import ( AdvancedCompleteQueryRequest, AdvancedCompleteQueryResponse, CompleteQueryRequest, CompleteQueryResponse, ) -from .control import Condition, Control +from .control import ( + Condition, + Control, +) from .control_service import ( CreateControlRequest, DeleteControlRequest, @@ -69,7 +79,9 @@ UpdateConversationRequest, UpdateSessionRequest, ) -from .custom_tuning_model import CustomTuningModel +from .custom_tuning_model import ( + CustomTuningModel, +) from .data_store import ( DataStore, LanguageInfo, @@ -86,8 +98,12 @@ ListDataStoresResponse, UpdateDataStoreRequest, ) -from .document import Document -from .document_processing_config import DocumentProcessingConfig +from .document import ( + Document, +) +from .document_processing_config import ( + DocumentProcessingConfig, +) from .document_service import ( BatchGetDocumentsMetadataRequest, BatchGetDocumentsMetadataResponse, @@ -98,7 +114,9 @@ ListDocumentsResponse, UpdateDocumentRequest, ) -from .engine import Engine +from .engine import ( + Engine, +) from .engine_service import ( CreateEngineMetadata, CreateEngineRequest, @@ -114,7 +132,10 @@ TuneEngineResponse, UpdateEngineRequest, ) -from .evaluation import Evaluation, QualityMetrics +from .evaluation import ( + Evaluation, + QualityMetrics, +) from .evaluation_service import ( CreateEvaluationMetadata, CreateEvaluationRequest, @@ -132,7 +153,11 @@ GenerateGroundedContentResponse, GroundedGenerationContent, ) -from .grounding import FactChunk, GroundingConfig, GroundingFact +from .grounding import ( + FactChunk, + GroundingConfig, + GroundingFact, +) from .import_config import ( AlloyDbSource, BigQuerySource, @@ -160,8 +185,13 @@ ImportUserEventsResponse, SpannerSource, ) -from .project import Project -from .project_service import ProvisionProjectMetadata, ProvisionProjectRequest +from .project import ( + Project, +) +from .project_service import ( + ProvisionProjectMetadata, + ProvisionProjectRequest, +) from .purge_config import ( PurgeCompletionSuggestionsMetadata, PurgeCompletionSuggestionsRequest, @@ -177,9 +207,18 @@ PurgeUserEventsRequest, PurgeUserEventsResponse, ) -from .rank_service import RankingRecord, RankRequest, RankResponse -from .recommendation_service import RecommendRequest, RecommendResponse -from .sample_query import SampleQuery +from .rank_service import ( + RankingRecord, + RankRequest, + RankResponse, +) +from .recommendation_service import ( + RecommendRequest, + RecommendResponse, +) +from .sample_query import ( + SampleQuery, +) from .sample_query_service import ( CreateSampleQueryRequest, DeleteSampleQueryRequest, @@ -188,7 +227,9 @@ ListSampleQueriesResponse, UpdateSampleQueryRequest, ) -from .sample_query_set import SampleQuerySet +from .sample_query_set import ( + SampleQuerySet, +) from .sample_query_set_service import ( CreateSampleQuerySetRequest, DeleteSampleQuerySetRequest, @@ -197,7 +238,9 @@ ListSampleQuerySetsResponse, UpdateSampleQuerySetRequest, ) -from .schema import Schema +from .schema import ( + Schema, +) from .schema_service import ( CreateSchemaMetadata, CreateSchemaRequest, @@ -209,7 +252,10 @@ UpdateSchemaMetadata, UpdateSchemaRequest, ) -from .search_service import SearchRequest, SearchResponse +from .search_service import ( + SearchRequest, + SearchResponse, +) from .search_tuning_service import ( ListCustomModelsRequest, ListCustomModelsResponse, @@ -217,14 +263,19 @@ TrainCustomModelRequest, TrainCustomModelResponse, ) -from .serving_config import ServingConfig +from .serving_config import ( + ServingConfig, +) from .serving_config_service import ( GetServingConfigRequest, ListServingConfigsRequest, ListServingConfigsResponse, UpdateServingConfigRequest, ) -from .session import Query, Session +from .session import ( + Query, + Session, +) from .site_search_engine import ( Sitemap, SiteSearchEngine, @@ -276,7 +327,10 @@ TransactionInfo, UserEvent, ) -from .user_event_service import CollectUserEventRequest, WriteUserEventRequest +from .user_event_service import ( + CollectUserEventRequest, + WriteUserEventRequest, +) __all__ = ( "Answer", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py index b4a969b6f684..5fdfd6c0beda 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/answer.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore -import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -73,6 +75,7 @@ class State(proto.Enum): SUCCEEDED (3): Answer generation has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -131,6 +134,7 @@ class AnswerSkippedReason(proto.Enum): Google skips the answer if a well grounded answer was unable to be generated. """ + ANSWER_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_ANSWER_SEEKING_QUERY_IGNORED = 2 @@ -440,6 +444,7 @@ class State(proto.Enum): SUCCEEDED (3): Step has succeeded. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 FAILED = 2 @@ -666,6 +671,7 @@ class Type(proto.Enum): Non-answer-seeking query classification type, for no clear intent. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/chunk.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/chunk.py index 495c1b461a84..5d6f9afff977 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/chunk.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/chunk.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore +from google.protobuf import struct_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py index 77a3ec8f1d3f..b3cfdd4a5b61 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/common.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ @@ -51,6 +52,7 @@ class IndustryVertical(proto.Enum): HEALTHCARE_FHIR (7): The healthcare FHIR vertical. """ + INDUSTRY_VERTICAL_UNSPECIFIED = 0 GENERIC = 1 MEDIA = 2 @@ -76,6 +78,7 @@ class SolutionType(proto.Enum): data stores must enrolled with ``SOLUTION_TYPE_CHAT`` solution. """ + SOLUTION_TYPE_UNSPECIFIED = 0 SOLUTION_TYPE_RECOMMENDATION = 1 SOLUTION_TYPE_SEARCH = 2 @@ -98,6 +101,7 @@ class SearchUseCase(proto.Enum): Browse use case. Expects the traffic has an empty [query][google.cloud.discoveryengine.v1beta.SearchRequest.query]. """ + SEARCH_USE_CASE_UNSPECIFIED = 0 SEARCH_USE_CASE_SEARCH = 1 SEARCH_USE_CASE_BROWSE = 2 @@ -117,6 +121,7 @@ class SearchTier(proto.Enum): SEARCH_TIER_ENTERPRISE (2): Enterprise tier. """ + SEARCH_TIER_UNSPECIFIED = 0 SEARCH_TIER_STANDARD = 1 SEARCH_TIER_ENTERPRISE = 2 @@ -132,6 +137,7 @@ class SearchAddOn(proto.Enum): SEARCH_ADD_ON_LLM (1): Large language model add-on. """ + SEARCH_ADD_ON_UNSPECIFIED = 0 SEARCH_ADD_ON_LLM = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py index 0a8b684bf6a3..7007201f3831 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ @@ -54,6 +55,7 @@ class MatchOperator(proto.Enum): CONTAINS (2): If the suggestion contains the block_phrase, then block it. """ + MATCH_OPERATOR_UNSPECIFIED = 0 EXACT_MATCH = 1 CONTAINS = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py index e577c83b84f4..6ecd2edc27a9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/completion_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import common from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -52,24 +53,24 @@ class CompleteQueryRequest(proto.Message): model specified in the Configuration > Autocomplete section of the Cloud console. Currently supported values: - - ``document`` - Using suggestions generated from - user-imported documents. - - ``search-history`` - Using suggestions generated from the - past history of - [SearchService.Search][google.cloud.discoveryengine.v1beta.SearchService.Search] - API calls. Do not use it when there is no traffic for - Search API. - - ``user-event`` - Using suggestions generated from - user-imported search events. - - ``document-completable`` - Using suggestions taken - directly from user-imported document fields marked as - completable. + - ``document`` - Using suggestions generated from + user-imported documents. + - ``search-history`` - Using suggestions generated from the + past history of + [SearchService.Search][google.cloud.discoveryengine.v1beta.SearchService.Search] + API calls. Do not use it when there is no traffic for + Search API. + - ``user-event`` - Using suggestions generated from + user-imported search events. + - ``document-completable`` - Using suggestions taken + directly from user-imported document fields marked as + completable. Default values: - - ``document`` is the default model for regular dataStores. - - ``search-history`` is the default model for site search - dataStores. + - ``document`` is the default model for regular dataStores. + - ``search-history`` is the default model for site search + dataStores. user_pseudo_id (str): A unique identifier for tracking visitors. For example, this could be implemented with an HTTP cookie, which should be @@ -199,24 +200,24 @@ class AdvancedCompleteQueryRequest(proto.Message): model specified in the Configuration > Autocomplete section of the Cloud console. Currently supported values: - - ``document`` - Using suggestions generated from - user-imported documents. - - ``search-history`` - Using suggestions generated from the - past history of - [SearchService.Search][google.cloud.discoveryengine.v1beta.SearchService.Search] - API calls. Do not use it when there is no traffic for - Search API. - - ``user-event`` - Using suggestions generated from - user-imported search events. - - ``document-completable`` - Using suggestions taken - directly from user-imported document fields marked as - completable. + - ``document`` - Using suggestions generated from + user-imported documents. + - ``search-history`` - Using suggestions generated from the + past history of + [SearchService.Search][google.cloud.discoveryengine.v1beta.SearchService.Search] + API calls. Do not use it when there is no traffic for + Search API. + - ``user-event`` - Using suggestions generated from + user-imported search events. + - ``document-completable`` - Using suggestions taken + directly from user-imported document fields marked as + completable. Default values: - - ``document`` is the default model for regular dataStores. - - ``search-history`` is the default model for site search - dataStores. + - ``document`` is the default model for regular dataStores. + - ``search-history`` is the default model for site search + dataStores. user_pseudo_id (str): A unique identifier for tracking visitors. For example, this could be implemented with an HTTP cookie, which should be @@ -275,6 +276,7 @@ class SuggestionType(proto.Enum): GOOGLE_WORKSPACE (5): Returns Google Workspace suggestions. """ + SUGGESTION_TYPE_UNSPECIFIED = 0 QUERY = 1 PEOPLE = 2 @@ -312,8 +314,8 @@ class ConditionBoostSpec(proto.Message): Example: - - To boost suggestions in languages ``en`` or ``fr``: - ``(lang_code: ANY("en", "fr"))`` + - To boost suggestions in languages ``en`` or ``fr``: + ``(lang_code: ANY("en", "fr"))`` boost (float): Strength of the boost, which should be in [-1, 1]. Negative boost means demotion. Default is 0.0. @@ -472,6 +474,7 @@ class PersonType(proto.Enum): THIRD_PARTY_IDENTITY (2): The suggestion is from a THIRD_PARTY_IDENTITY source. """ + PERSON_TYPE_UNSPECIFIED = 0 CLOUD_IDENTITY = 1 THIRD_PARTY_IDENTITY = 2 @@ -525,6 +528,7 @@ class ContentType(proto.Enum): THIRD_PARTY (2): The suggestion is from a third party source. """ + CONTENT_TYPE_UNSPECIFIED = 0 GOOGLE_WORKSPACE = 1 THIRD_PARTY = 2 @@ -589,12 +593,12 @@ class RecentSearchSuggestion(proto.Message): number=4, message=ContentSuggestion, ) - recent_search_suggestions: MutableSequence[ - RecentSearchSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=5, - message=RecentSearchSuggestion, + recent_search_suggestions: MutableSequence[RecentSearchSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=5, + message=RecentSearchSuggestion, + ) ) diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control.py index 18f251314407..a5e6a292e6f2 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import common +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control_service.py index 0f75538cf8ef..15135e055ccd 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/control_service.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import control as gcd_control +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -80,8 +81,8 @@ class UpdateControlRequest(proto.Message): [Control][google.cloud.discoveryengine.v1beta.Control] to update. The following are NOT supported: - - [Control.name][google.cloud.discoveryengine.v1beta.Control.name] - - [Control.solution_type][google.cloud.discoveryengine.v1beta.Control.solution_type] + - [Control.name][google.cloud.discoveryengine.v1beta.Control.name] + - [Control.solution_type][google.cloud.discoveryengine.v1beta.Control.solution_type] If not set or empty, all supported fields are updated. """ @@ -150,9 +151,9 @@ class ListControlsRequest(proto.Message): Optional. A filter to apply on the list results. Supported features: - - List all the products under the parent branch if - [filter][google.cloud.discoveryengine.v1beta.ListControlsRequest.filter] - is unset. Currently this field is unsupported. + - List all the products under the parent branch if + [filter][google.cloud.discoveryengine.v1beta.ListControlsRequest.filter] + is unset. Currently this field is unsupported. """ parent: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py index 55405fdd47db..187bbd01ecc9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversation.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_service +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -68,6 +69,7 @@ class State(proto.Enum): COMPLETED (2): Conversation has been completed. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 COMPLETED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py index 17b66604760f..72e598c04617 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/conversational_search_service.py @@ -17,13 +17,14 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1beta.types import answer as gcd_answer +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1beta.types import search_service from google.cloud.discoveryengine_v1beta.types import session as gcd_session +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -80,20 +81,20 @@ class ConverseConversationRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -203,12 +204,12 @@ class ConverseConversationResponse(proto.Message): proto.STRING, number=6, ) - search_results: MutableSequence[ - search_service.SearchResponse.SearchResult - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message=search_service.SearchResponse.SearchResult, + search_results: MutableSequence[search_service.SearchResponse.SearchResult] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message=search_service.SearchResponse.SearchResult, + ) ) @@ -245,7 +246,7 @@ class UpdateConversationRequest(proto.Message): [Conversation][google.cloud.discoveryengine.v1beta.Conversation] to update. The following are NOT supported: - - [Conversation.name][google.cloud.discoveryengine.v1beta.Conversation.name] + - [Conversation.name][google.cloud.discoveryengine.v1beta.Conversation.name] If not set or empty, all supported fields are updated. """ @@ -318,9 +319,9 @@ class ListConversationsRequest(proto.Message): ascending order. Use "desc" after a field name for descending. Supported fields: - - ``update_time`` - - ``create_time`` - - ``conversation_name`` + - ``update_time`` + - ``create_time`` + - ``conversation_name`` Example: "update_time desc" "create_time". """ @@ -441,20 +442,20 @@ class AnswerQueryRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -516,6 +517,7 @@ class FilteringLevel(proto.Enum): FILTERING_LEVEL_HIGH (2): Filter answers based on a high threshold. """ + FILTERING_LEVEL_UNSPECIFIED = 0 FILTERING_LEVEL_LOW = 1 FILTERING_LEVEL_HIGH = 2 @@ -1042,6 +1044,7 @@ class Type(proto.Enum): Non-answer-seeking query classification type, for no clear intent. """ + TYPE_UNSPECIFIED = 0 ADVERSARIAL_QUERY = 1 NON_ANSWER_SEEKING_QUERY = 2 @@ -1234,7 +1237,7 @@ class UpdateSessionRequest(proto.Message): [Session][google.cloud.discoveryengine.v1beta.Session] to update. The following are NOT supported: - - [Session.name][google.cloud.discoveryengine.v1beta.Session.name] + - [Session.name][google.cloud.discoveryengine.v1beta.Session.name] If not set or empty, all supported fields are updated. """ @@ -1307,14 +1310,14 @@ class ListSessionsRequest(proto.Message): A comma-separated list of fields to filter by, in EBNF grammar. The supported fields are: - - ``user_pseudo_id`` - - ``state`` - - ``display_name`` - - ``starred`` - - ``is_pinned`` - - ``labels`` - - ``create_time`` - - ``update_time`` + - ``user_pseudo_id`` + - ``state`` + - ``display_name`` + - ``starred`` + - ``is_pinned`` + - ``labels`` + - ``create_time`` + - ``update_time`` Examples: "user_pseudo_id = some_id" "display_name = "some_name"" "starred = true" "is_pinned=true AND (NOT @@ -1324,17 +1327,17 @@ class ListSessionsRequest(proto.Message): ascending order. Use "desc" after a field name for descending. Supported fields: - - ``update_time`` - - ``create_time`` - - ``session_name`` - - ``is_pinned`` + - ``update_time`` + - ``create_time`` + - ``session_name`` + - ``is_pinned`` Example: - - "update_time desc" - - "create_time" - - "is_pinned desc,update_time desc": list sessions by - is_pinned first, then by update_time. + - "update_time desc" + - "create_time" + - "is_pinned desc,update_time desc": list sessions by + is_pinned first, then by update_time. """ parent: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py index 6f67d52fa25d..ea84fc84d08d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/custom_tuning_model.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ @@ -83,6 +85,7 @@ class ModelState(proto.Enum): Input data validation failed. Model training didn't start. """ + MODEL_STATE_UNSPECIFIED = 0 TRAINING_PAUSED = 1 TRAINING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py index 76f64b5352c7..9f3704d001a5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store.py @@ -17,14 +17,15 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.cloud.discoveryengine_v1beta.types import common from google.cloud.discoveryengine_v1beta.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1beta.types import common from google.cloud.discoveryengine_v1beta.types import schema +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -62,10 +63,11 @@ class DataStore(proto.Message): solutions for each [industry_vertical][google.cloud.discoveryengine.v1beta.DataStore.industry_vertical]: - - ``MEDIA``: ``SOLUTION_TYPE_RECOMMENDATION`` and - ``SOLUTION_TYPE_SEARCH``. - - ``SITE_SEARCH``: ``SOLUTION_TYPE_SEARCH`` is automatically - enrolled. Other solutions cannot be enrolled. + - ``MEDIA``: ``SOLUTION_TYPE_RECOMMENDATION`` and + ``SOLUTION_TYPE_SEARCH``. + - ``SITE_SEARCH``: ``SOLUTION_TYPE_SEARCH`` is + automatically enrolled. Other solutions cannot be + enrolled. default_schema_id (str): Output only. The id of the default [Schema][google.cloud.discoveryengine.v1beta.Schema] @@ -138,6 +140,7 @@ class ContentConfig(proto.Enum): workspace data store are specified in the [WorkspaceConfig][google.cloud.discoveryengine.v1beta.WorkspaceConfig]. """ + CONTENT_CONFIG_UNSPECIFIED = 0 NO_CONTENT = 1 CONTENT_REQUIRED = 2 @@ -342,6 +345,7 @@ class Mode(proto.Enum): Natural Language Query Understanding is enabled. """ + MODE_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -396,6 +400,7 @@ class Type(proto.Enum): GOOGLE_KEEP (7): Workspace Data Store contains Keep data """ + TYPE_UNSPECIFIED = 0 GOOGLE_DRIVE = 1 GOOGLE_MAIL = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store_service.py index faf087d44736..b3f094a5f228 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/data_store_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document.py index d673a125fca2..de4f779ac886 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document.py @@ -17,10 +17,12 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore -import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -95,11 +97,11 @@ class Document(proto.Message): index_status (google.cloud.discoveryengine_v1beta.types.Document.IndexStatus): Output only. The index status of the document. - - If document is indexed successfully, the index_time field - is populated. - - Otherwise, if document is not indexed due to errors, the - error_samples field is populated. - - Otherwise, index_status is unset. + - If document is indexed successfully, the index_time field + is populated. + - Otherwise, if document is not indexed due to errors, the + error_samples field is populated. + - Otherwise, index_status is unset. """ class Content(proto.Message): @@ -135,14 +137,14 @@ class Content(proto.Message): mime_type (str): The MIME type of the content. Supported types: - - ``application/pdf`` (PDF, only native PDFs are supported - for now) - - ``text/html`` (HTML) - - ``application/vnd.openxmlformats-officedocument.wordprocessingml.document`` - (DOCX) - - ``application/vnd.openxmlformats-officedocument.presentationml.presentation`` - (PPTX) - - ``text/plain`` (TXT) + - ``application/pdf`` (PDF, only native PDFs are supported + for now) + - ``text/html`` (HTML) + - ``application/vnd.openxmlformats-officedocument.wordprocessingml.document`` + (DOCX) + - ``application/vnd.openxmlformats-officedocument.presentationml.presentation`` + (PPTX) + - ``text/plain`` (TXT) See https://www.iana.org/assignments/media-types/media-types.xhtml. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_processing_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_processing_config.py index d5840f2ac08f..d48af0cd1af9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_processing_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_processing_config.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ @@ -54,19 +55,19 @@ class DocumentProcessingConfig(proto.Message): Map from file type to override the default parsing configuration based on the file type. Supported keys: - - ``pdf``: Override parsing config for PDF files, either - digital parsing, ocr parsing or layout parsing is - supported. - - ``html``: Override parsing config for HTML files, only - digital parsing and layout parsing are supported. - - ``docx``: Override parsing config for DOCX files, only - digital parsing and layout parsing are supported. - - ``pptx``: Override parsing config for PPTX files, only - digital parsing and layout parsing are supported. - - ``xlsm``: Override parsing config for XLSM files, only - digital parsing and layout parsing are supported. - - ``xlsx``: Override parsing config for XLSX files, only - digital parsing and layout parsing are supported. + - ``pdf``: Override parsing config for PDF files, either + digital parsing, ocr parsing or layout parsing is + supported. + - ``html``: Override parsing config for HTML files, only + digital parsing and layout parsing are supported. + - ``docx``: Override parsing config for DOCX files, only + digital parsing and layout parsing are supported. + - ``pptx``: Override parsing config for PPTX files, only + digital parsing and layout parsing are supported. + - ``xlsm``: Override parsing config for XLSM files, only + digital parsing and layout parsing are supported. + - ``xlsx``: Override parsing config for XLSX files, only + digital parsing and layout parsing are supported. """ class ChunkingConfig(proto.Message): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py index 35a4e549e55b..6f38281393a8 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/document_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -395,6 +396,7 @@ class State(proto.Enum): The [Document][google.cloud.discoveryengine.v1beta.Document] is not indexed. """ + STATE_UNSPECIFIED = 0 INDEXED = 1 NOT_IN_TARGET_SITE = 2 @@ -420,10 +422,10 @@ class DocumentMetadata(proto.Message): Allowed values are: - - ``batch``: Data ingested via Batch API, e.g., - ImportDocuments. - - ``streaming`` Data ingested via Streaming API, e.g., FHIR - streaming. + - ``batch``: Data ingested via Batch API, e.g., + ImportDocuments. + - ``streaming`` Data ingested via Streaming API, e.g., FHIR + streaming. """ class MatcherValue(proto.Message): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine.py index ae9bd23a98af..8a3368f98178 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import common +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine_service.py index da3b04f82745..01153f8c2be9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/engine_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py index 3eaa5a067c45..e9ef4cd5db4a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import search_service +from google.protobuf import timestamp_pb2 # type: ignore +from google.rpc import status_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -92,6 +93,7 @@ class State(proto.Enum): FAILED (4): The evaluation failed. """ + STATE_UNSPECIFIED = 0 PENDING = 1 RUNNING = 2 @@ -112,13 +114,13 @@ class EvaluationSpec(proto.Message): supported; if any other fields are provided, an UNSUPPORTED error will be returned: - - [SearchRequest.serving_config][google.cloud.discoveryengine.v1beta.SearchRequest.serving_config] - - [SearchRequest.branch][google.cloud.discoveryengine.v1beta.SearchRequest.branch] - - [SearchRequest.canonical_filter][google.cloud.discoveryengine.v1beta.SearchRequest.canonical_filter] - - [SearchRequest.query_expansion_spec][google.cloud.discoveryengine.v1beta.SearchRequest.query_expansion_spec] - - [SearchRequest.spell_correction_spec][google.cloud.discoveryengine.v1beta.SearchRequest.spell_correction_spec] - - [SearchRequest.content_search_spec][google.cloud.discoveryengine.v1beta.SearchRequest.content_search_spec] - - [SearchRequest.user_pseudo_id][google.cloud.discoveryengine.v1beta.SearchRequest.user_pseudo_id] + - [SearchRequest.serving_config][google.cloud.discoveryengine.v1beta.SearchRequest.serving_config] + - [SearchRequest.branch][google.cloud.discoveryengine.v1beta.SearchRequest.branch] + - [SearchRequest.canonical_filter][google.cloud.discoveryengine.v1beta.SearchRequest.canonical_filter] + - [SearchRequest.query_expansion_spec][google.cloud.discoveryengine.v1beta.SearchRequest.query_expansion_spec] + - [SearchRequest.spell_correction_spec][google.cloud.discoveryengine.v1beta.SearchRequest.spell_correction_spec] + - [SearchRequest.content_search_spec][google.cloud.discoveryengine.v1beta.SearchRequest.content_search_spec] + - [SearchRequest.user_pseudo_id][google.cloud.discoveryengine.v1beta.SearchRequest.user_pseudo_id] This field is a member of `oneof`_ ``search_spec``. query_set_spec (google.cloud.discoveryengine_v1beta.types.Evaluation.EvaluationSpec.QuerySetSpec): @@ -206,10 +208,10 @@ class QualityMetrics(proto.Message): Example (top-5): - - For a single - [SampleQuery][google.cloud.discoveryengine.v1beta.SampleQuery], - If 3 out of 5 relevant documents are retrieved in the - top-5, recall@5 = 3/5 = 0.6 + - For a single + [SampleQuery][google.cloud.discoveryengine.v1beta.SampleQuery], + If 3 out of 5 relevant documents are retrieved in the + top-5, recall@5 = 3/5 = 0.6 doc_precision (google.cloud.discoveryengine_v1beta.types.QualityMetrics.TopkMetrics): Precision per document, at various top-k cutoff levels. @@ -218,10 +220,10 @@ class QualityMetrics(proto.Message): Example (top-5): - - For a single - [SampleQuery][google.cloud.discoveryengine.v1beta.SampleQuery], - If 4 out of 5 retrieved documents in the top-5 are - relevant, precision@5 = 4/5 = 0.8 + - For a single + [SampleQuery][google.cloud.discoveryengine.v1beta.SampleQuery], + If 4 out of 5 retrieved documents in the top-5 are + relevant, precision@5 = 4/5 = 0.8 doc_ndcg (google.cloud.discoveryengine_v1beta.types.QualityMetrics.TopkMetrics): Normalized discounted cumulative gain (NDCG) per document, at various top-k cutoff levels. @@ -250,10 +252,10 @@ class QualityMetrics(proto.Message): Example (top-5): - - For a single - [SampleQuery][google.cloud.discoveryengine.v1beta.SampleQuery], - if 3 out of 5 relevant pages are retrieved in the top-5, - recall@5 = 3/5 = 0.6 + - For a single + [SampleQuery][google.cloud.discoveryengine.v1beta.SampleQuery], + if 3 out of 5 relevant pages are retrieved in the top-5, + recall@5 = 3/5 = 0.6 page_ndcg (google.cloud.discoveryengine_v1beta.types.QualityMetrics.TopkMetrics): Normalized discounted cumulative gain (NDCG) per page, at various top-k cutoff levels. diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation_service.py index 5f46e95ab5ac..c495aece3752 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/evaluation_service.py @@ -22,6 +22,7 @@ from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py index e17521198310..8fa27e07aaff 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounded_generation_service.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1beta.types import grounding + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ @@ -108,20 +109,20 @@ class GenerateGroundedContentRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -248,6 +249,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 @@ -310,12 +312,12 @@ class InlineSource(proto.Message): author of the content). """ - grounding_facts: MutableSequence[ - grounding.GroundingFact - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=grounding.GroundingFact, + grounding_facts: MutableSequence[grounding.GroundingFact] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=grounding.GroundingFact, + ) ) attributes: MutableMapping[str, str] = proto.MapField( proto.STRING, @@ -529,6 +531,7 @@ class Source(proto.Enum): GOOGLE_MAPS (4): Google Maps. """ + SOURCE_UNSPECIFIED = 0 VERTEX_AI_SEARCH = 1 GOOGLE_SEARCH = 3 @@ -591,6 +594,7 @@ class Version(proto.Enum): The V1 model which is evaluating each source independently. """ + VERSION_UNSPECIFIED = 0 V1_INDEPENDENT = 1 @@ -763,20 +767,20 @@ class CheckGroundingRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounding.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounding.py index c0a16c4c7d73..c157c1ff7bd9 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounding.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/grounding.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py index c1458f15a46d..82413bfada31 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/import_config.py @@ -17,18 +17,17 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + +from google.cloud.discoveryengine_v1beta.types import completion +from google.cloud.discoveryengine_v1beta.types import document +from google.cloud.discoveryengine_v1beta.types import sample_query +from google.cloud.discoveryengine_v1beta.types import user_event from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore from google.type import date_pb2 # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import ( - completion, - document, - sample_query, - user_event, -) __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -81,30 +80,30 @@ class GcsSource(proto.Message): Supported values for document imports: - - ``document`` (default): One JSON - [Document][google.cloud.discoveryengine.v1beta.Document] - per line. Each document must have a valid - [Document.id][google.cloud.discoveryengine.v1beta.Document.id]. - - ``content``: Unstructured data (e.g. PDF, HTML). Each file - matched by ``input_uris`` becomes a document, with the ID - set to the first 128 bits of SHA256(URI) encoded as a hex - string. - - ``custom``: One custom data JSON per row in arbitrary - format that conforms to the defined - [Schema][google.cloud.discoveryengine.v1beta.Schema] of - the data store. This can only be used by the GENERIC Data - Store vertical. - - ``csv``: A CSV file with header conforming to the defined - [Schema][google.cloud.discoveryengine.v1beta.Schema] of - the data store. Each entry after the header is imported as - a Document. This can only be used by the GENERIC Data - Store vertical. + - ``document`` (default): One JSON + [Document][google.cloud.discoveryengine.v1beta.Document] + per line. Each document must have a valid + [Document.id][google.cloud.discoveryengine.v1beta.Document.id]. + - ``content``: Unstructured data (e.g. PDF, HTML). Each + file matched by ``input_uris`` becomes a document, with + the ID set to the first 128 bits of SHA256(URI) encoded + as a hex string. + - ``custom``: One custom data JSON per row in arbitrary + format that conforms to the defined + [Schema][google.cloud.discoveryengine.v1beta.Schema] of + the data store. This can only be used by the GENERIC Data + Store vertical. + - ``csv``: A CSV file with header conforming to the defined + [Schema][google.cloud.discoveryengine.v1beta.Schema] of + the data store. Each entry after the header is imported + as a Document. This can only be used by the GENERIC Data + Store vertical. Supported values for user event imports: - - ``user_event`` (default): One JSON - [UserEvent][google.cloud.discoveryengine.v1beta.UserEvent] - per line. + - ``user_event`` (default): One JSON + [UserEvent][google.cloud.discoveryengine.v1beta.UserEvent] + per line. """ input_uris: MutableSequence[str] = proto.RepeatedField( @@ -151,25 +150,25 @@ class BigQuerySource(proto.Message): Supported values for user event imports: - - ``user_event`` (default): One - [UserEvent][google.cloud.discoveryengine.v1beta.UserEvent] - per row. + - ``user_event`` (default): One + [UserEvent][google.cloud.discoveryengine.v1beta.UserEvent] + per row. Supported values for document imports: - - ``document`` (default): One - [Document][google.cloud.discoveryengine.v1beta.Document] - format per row. Each document must have a valid - [Document.id][google.cloud.discoveryengine.v1beta.Document.id] - and one of - [Document.json_data][google.cloud.discoveryengine.v1beta.Document.json_data] - or - [Document.struct_data][google.cloud.discoveryengine.v1beta.Document.struct_data]. - - ``custom``: One custom data per row in arbitrary format - that conforms to the defined - [Schema][google.cloud.discoveryengine.v1beta.Schema] of - the data store. This can only be used by the GENERIC Data - Store vertical. + - ``document`` (default): One + [Document][google.cloud.discoveryengine.v1beta.Document] + format per row. Each document must have a valid + [Document.id][google.cloud.discoveryengine.v1beta.Document.id] + and one of + [Document.json_data][google.cloud.discoveryengine.v1beta.Document.json_data] + or + [Document.struct_data][google.cloud.discoveryengine.v1beta.Document.struct_data]. + - ``custom``: One custom data per row in arbitrary format + that conforms to the defined + [Schema][google.cloud.discoveryengine.v1beta.Schema] of + the data store. This can only be used by the GENERIC Data + Store vertical. """ partition_date: date_pb2.Date = proto.Field( @@ -286,6 +285,7 @@ class Type(proto.Enum): JSON (7): JSON type. """ + TYPE_UNSPECIFIED = 0 STRING = 1 NUMBER = 2 @@ -306,6 +306,7 @@ class Encoding(proto.Enum): BINARY (2): Binary encoding. """ + ENCODING_UNSPECIFIED = 0 TEXT = 1 BINARY = 2 @@ -325,11 +326,11 @@ class BigtableColumnFamily(proto.Message): The encoding mode of the values when the type is not STRING. Acceptable encoding values are: - - ``TEXT``: indicates values are alphanumeric text strings. - - ``BINARY``: indicates values are encoded using - ``HBase Bytes.toBytes`` family of functions. This can be - overridden for a specific column by listing that column in - ``columns`` and specifying an encoding for it. + - ``TEXT``: indicates values are alphanumeric text strings. + - ``BINARY``: indicates values are encoded using + ``HBase Bytes.toBytes`` family of functions. This can be + overridden for a specific column by listing that column + in ``columns`` and specifying an encoding for it. type_ (google.cloud.discoveryengine_v1beta.types.BigtableOptions.Type): The type of values in this column family. The values are expected to be encoded using ``HBase Bytes.toBytes`` @@ -354,12 +355,12 @@ class BigtableColumnFamily(proto.Message): number=3, enum="BigtableOptions.Type", ) - columns: MutableSequence[ - "BigtableOptions.BigtableColumn" - ] = proto.RepeatedField( - proto.MESSAGE, - number=4, - message="BigtableOptions.BigtableColumn", + columns: MutableSequence["BigtableOptions.BigtableColumn"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=4, + message="BigtableOptions.BigtableColumn", + ) ) class BigtableColumn(proto.Message): @@ -381,11 +382,11 @@ class BigtableColumn(proto.Message): The encoding mode of the values when the type is not ``STRING``. Acceptable encoding values are: - - ``TEXT``: indicates values are alphanumeric text strings. - - ``BINARY``: indicates values are encoded using - ``HBase Bytes.toBytes`` family of functions. This can be - overridden for a specific column by listing that column in - ``columns`` and specifying an encoding for it. + - ``TEXT``: indicates values are alphanumeric text strings. + - ``BINARY``: indicates values are encoded using + ``HBase Bytes.toBytes`` family of functions. This can be + overridden for a specific column by listing that column + in ``columns`` and specifying an encoding for it. type_ (google.cloud.discoveryengine_v1beta.types.BigtableOptions.Type): The type of values in this column family. The values are expected to be encoded using ``HBase Bytes.toBytes`` @@ -972,18 +973,18 @@ class ImportDocumentsRequest(proto.Message): Supported data sources: - - [GcsSource][google.cloud.discoveryengine.v1beta.GcsSource]. - [GcsSource.data_schema][google.cloud.discoveryengine.v1beta.GcsSource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [BigQuerySource][google.cloud.discoveryengine.v1beta.BigQuerySource]. - [BigQuerySource.data_schema][google.cloud.discoveryengine.v1beta.BigQuerySource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [SpannerSource][google.cloud.discoveryengine.v1beta.SpannerSource]. - - [CloudSqlSource][google.cloud.discoveryengine.v1beta.CloudSqlSource]. - - [FirestoreSource][google.cloud.discoveryengine.v1beta.FirestoreSource]. - - [BigtableSource][google.cloud.discoveryengine.v1beta.BigtableSource]. + - [GcsSource][google.cloud.discoveryengine.v1beta.GcsSource]. + [GcsSource.data_schema][google.cloud.discoveryengine.v1beta.GcsSource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [BigQuerySource][google.cloud.discoveryengine.v1beta.BigQuerySource]. + [BigQuerySource.data_schema][google.cloud.discoveryengine.v1beta.BigQuerySource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [SpannerSource][google.cloud.discoveryengine.v1beta.SpannerSource]. + - [CloudSqlSource][google.cloud.discoveryengine.v1beta.CloudSqlSource]. + - [FirestoreSource][google.cloud.discoveryengine.v1beta.FirestoreSource]. + - [BigtableSource][google.cloud.discoveryengine.v1beta.BigtableSource]. id_field (str): The field indicates the ID field or column to be used as unique IDs of the documents. @@ -1013,18 +1014,18 @@ class ImportDocumentsRequest(proto.Message): Supported data sources: - - [GcsSource][google.cloud.discoveryengine.v1beta.GcsSource]. - [GcsSource.data_schema][google.cloud.discoveryengine.v1beta.GcsSource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [BigQuerySource][google.cloud.discoveryengine.v1beta.BigQuerySource]. - [BigQuerySource.data_schema][google.cloud.discoveryengine.v1beta.BigQuerySource.data_schema] - must be ``custom`` or ``csv``. Otherwise, an - INVALID_ARGUMENT error is thrown. - - [SpannerSource][google.cloud.discoveryengine.v1beta.SpannerSource]. - - [CloudSqlSource][google.cloud.discoveryengine.v1beta.CloudSqlSource]. - - [FirestoreSource][google.cloud.discoveryengine.v1beta.FirestoreSource]. - - [BigtableSource][google.cloud.discoveryengine.v1beta.BigtableSource]. + - [GcsSource][google.cloud.discoveryengine.v1beta.GcsSource]. + [GcsSource.data_schema][google.cloud.discoveryengine.v1beta.GcsSource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [BigQuerySource][google.cloud.discoveryengine.v1beta.BigQuerySource]. + [BigQuerySource.data_schema][google.cloud.discoveryengine.v1beta.BigQuerySource.data_schema] + must be ``custom`` or ``csv``. Otherwise, an + INVALID_ARGUMENT error is thrown. + - [SpannerSource][google.cloud.discoveryengine.v1beta.SpannerSource]. + - [CloudSqlSource][google.cloud.discoveryengine.v1beta.CloudSqlSource]. + - [FirestoreSource][google.cloud.discoveryengine.v1beta.FirestoreSource]. + - [BigtableSource][google.cloud.discoveryengine.v1beta.BigtableSource]. """ class ReconciliationMode(proto.Enum): @@ -1043,6 +1044,7 @@ class ReconciliationMode(proto.Enum): deleted if they are not present in the source location. """ + RECONCILIATION_MODE_UNSPECIFIED = 0 INCREMENTAL = 1 FULL = 2 @@ -1201,8 +1203,8 @@ class ImportSuggestionDenyListEntriesRequest(proto.Message): import. Supported values ``gcs_source.schema`` for autocomplete suggestion deny list entry imports: - - ``suggestion_deny_list`` (default): One JSON - [SuggestionDenyListEntry] per line. + - ``suggestion_deny_list`` (default): One JSON + [SuggestionDenyListEntry] per line. This field is a member of `oneof`_ ``source``. parent (str): @@ -1220,12 +1222,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - entries: MutableSequence[ - completion.SuggestionDenyListEntry - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.SuggestionDenyListEntry, + entries: MutableSequence[completion.SuggestionDenyListEntry] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.SuggestionDenyListEntry, + ) ) inline_source: InlineSource = proto.Field( @@ -1348,12 +1350,12 @@ class InlineSource(proto.Message): import. Max of 1000 items. """ - suggestions: MutableSequence[ - completion.CompletionSuggestion - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=completion.CompletionSuggestion, + suggestions: MutableSequence[completion.CompletionSuggestion] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=completion.CompletionSuggestion, + ) ) inline_source: InlineSource = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py index 63d811e112e3..e8c98a060cd1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ @@ -60,11 +62,11 @@ class ServiceTerms(proto.Message): The unique identifier of this terms of service. Available terms: - - ``GA_DATA_USE_TERMS``: `Terms for data - use `__. - When using this as ``id``, the acceptable - [version][google.cloud.discoveryengine.v1beta.Project.ServiceTerms.version] - to provide is ``2022-11-23``. + - ``GA_DATA_USE_TERMS``: `Terms for data + use `__. + When using this as ``id``, the acceptable + [version][google.cloud.discoveryengine.v1beta.Project.ServiceTerms.version] + to provide is ``2022-11-23``. version (str): The version string of the terms of service. For acceptable values, see the comments for @@ -98,6 +100,7 @@ class State(proto.Enum): The project has declined or revoked the agreement to terms of service. """ + STATE_UNSPECIFIED = 0 TERMS_ACCEPTED = 1 TERMS_PENDING = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project_service.py index 45ddb4a7693e..f2fa0b245680 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/project_service.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/purge_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/purge_config.py index 56a18e79d469..8372cb3bea6a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/purge_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/purge_config.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore -from google.rpc import status_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import import_config +from google.protobuf import timestamp_pb2 # type: ignore +from google.rpc import status_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -56,23 +57,23 @@ class PurgeUserEventsRequest(proto.Message): deleted with a length limit of 5,000 characters. The eligible fields for filtering are: - - ``eventType``: Double quoted - [UserEvent.event_type][google.cloud.discoveryengine.v1beta.UserEvent.event_type] - string. - - ``eventTime``: in ISO 8601 "zulu" format. - - ``userPseudoId``: Double quoted string. Specifying this - will delete all events associated with a visitor. - - ``userId``: Double quoted string. Specifying this will - delete all events associated with a user. + - ``eventType``: Double quoted + [UserEvent.event_type][google.cloud.discoveryengine.v1beta.UserEvent.event_type] + string. + - ``eventTime``: in ISO 8601 "zulu" format. + - ``userPseudoId``: Double quoted string. Specifying this + will delete all events associated with a visitor. + - ``userId``: Double quoted string. Specifying this will + delete all events associated with a user. Examples: - - Deleting all events in a time range: - ``eventTime > "2012-04-23T18:25:43.511Z" eventTime < "2012-04-23T18:30:43.511Z"`` - - Deleting specific eventType: ``eventType = "search"`` - - Deleting all events for a specific visitor: - ``userPseudoId = "visitor1024"`` - - Deleting all events inside a DataStore: ``*`` + - Deleting all events in a time range: + ``eventTime > "2012-04-23T18:25:43.511Z" eventTime < "2012-04-23T18:30:43.511Z"`` + - Deleting specific eventType: ``eventType = "search"`` + - Deleting all events for a specific visitor: + ``userPseudoId = "visitor1024"`` + - Deleting all events inside a DataStore: ``*`` The filtering fields are assumed to have an implicit AND. force (bool): @@ -193,9 +194,9 @@ class PurgeDocumentsRequest(proto.Message): Cloud Storage location for the input content. Supported ``data_schema``: - - ``document_id``: One valid - [Document.id][google.cloud.discoveryengine.v1beta.Document.id] - per line. + - ``document_id``: One valid + [Document.id][google.cloud.discoveryengine.v1beta.Document.id] + per line. This field is a member of `oneof`_ ``source``. inline_source (google.cloud.discoveryengine_v1beta.types.PurgeDocumentsRequest.InlineSource): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/rank_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/rank_service.py index 8ef6ba5911c0..c39a963066c5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/rank_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/rank_service.py @@ -19,6 +19,7 @@ import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ @@ -85,8 +86,8 @@ class RankRequest(proto.Message): model (str): The identifier of the model to use. It is one of: - - ``semantic-ranker-512@latest``: Semantic ranking model - with maxiumn input token size 512. + - ``semantic-ranker-512@latest``: Semantic ranking model + with maxiumn input token size 512. It is set to ``semantic-ranker-512@latest`` by default if unspecified. @@ -107,20 +108,20 @@ class RankRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py index 51d09981d87b..27f69ccebd9a 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/recommendation_service.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import user_event as gcd_user_event from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.cloud.discoveryengine_v1beta.types import user_event as gcd_user_event +from google.protobuf import struct_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -84,18 +85,18 @@ class RecommendRequest(proto.Message): Examples: - - ``(filter_tags: ANY("Red", "Blue") OR filter_tags: ANY("Hot", "Cold"))`` - - ``(filter_tags: ANY("Red", "Blue")) AND NOT (filter_tags: ANY("Green"))`` + - ``(filter_tags: ANY("Red", "Blue") OR filter_tags: ANY("Hot", "Cold"))`` + - ``(filter_tags: ANY("Red", "Blue")) AND NOT (filter_tags: ANY("Green"))`` If ``attributeFilteringSyntax`` is set to true under the ``params`` field, then attribute-based expressions are expected instead of the above described tag-based syntax. Examples: - - (launguage: ANY("en", "es")) AND NOT (categories: - ANY("Movie")) - - (available: true) AND (launguage: ANY("en", "es")) OR - (categories: ANY("Movie")) + - (launguage: ANY("en", "es")) AND NOT (categories: + ANY("Movie")) + - (available: true) AND (launguage: ANY("en", "es")) OR + (categories: ANY("Movie")) If your filter blocks all results, the API returns generic (unfiltered) popular Documents. If you only want results @@ -119,51 +120,51 @@ class RecommendRequest(proto.Message): Allowed values: - - ``returnDocument``: Boolean. If set to ``true``, the - associated Document object is returned in - [RecommendResponse.RecommendationResult.document][google.cloud.discoveryengine.v1beta.RecommendResponse.RecommendationResult.document]. - - ``returnScore``: Boolean. If set to true, the - recommendation score corresponding to each returned - Document is set in - [RecommendResponse.RecommendationResult.metadata][google.cloud.discoveryengine.v1beta.RecommendResponse.RecommendationResult.metadata]. - The given score indicates the probability of a Document - conversion given the user's context and history. - - ``strictFiltering``: Boolean. True by default. If set to - ``false``, the service returns generic (unfiltered) - popular Documents instead of empty if your filter blocks - all recommendation results. - - ``diversityLevel``: String. Default empty. If set to be - non-empty, then it needs to be one of: - - - ``no-diversity`` - - ``low-diversity`` - - ``medium-diversity`` - - ``high-diversity`` - - ``auto-diversity`` This gives request-level control and - adjusts recommendation results based on Document - category. - - - ``attributeFilteringSyntax``: Boolean. False by default. - If set to true, the ``filter`` field is interpreted - according to the new, attribute-based syntax. + - ``returnDocument``: Boolean. If set to ``true``, the + associated Document object is returned in + [RecommendResponse.RecommendationResult.document][google.cloud.discoveryengine.v1beta.RecommendResponse.RecommendationResult.document]. + - ``returnScore``: Boolean. If set to true, the + recommendation score corresponding to each returned + Document is set in + [RecommendResponse.RecommendationResult.metadata][google.cloud.discoveryengine.v1beta.RecommendResponse.RecommendationResult.metadata]. + The given score indicates the probability of a Document + conversion given the user's context and history. + - ``strictFiltering``: Boolean. True by default. If set to + ``false``, the service returns generic (unfiltered) + popular Documents instead of empty if your filter blocks + all recommendation results. + - ``diversityLevel``: String. Default empty. If set to be + non-empty, then it needs to be one of: + + - ``no-diversity`` + - ``low-diversity`` + - ``medium-diversity`` + - ``high-diversity`` + - ``auto-diversity`` This gives request-level control + and adjusts recommendation results based on Document + category. + + - ``attributeFilteringSyntax``: Boolean. False by default. + If set to true, the ``filter`` field is interpreted + according to the new, attribute-based syntax. user_labels (MutableMapping[str, str]): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Requirements for labels `__ @@ -242,9 +243,9 @@ class RecommendationResult(proto.Message): Possible values: - - ``score``: Recommendation score in double value. Is set if - ``returnScore`` is set to true in - [RecommendRequest.params][google.cloud.discoveryengine.v1beta.RecommendRequest.params]. + - ``score``: Recommendation score in double value. Is set + if ``returnScore`` is set to true in + [RecommendRequest.params][google.cloud.discoveryengine.v1beta.RecommendRequest.params]. """ id: str = proto.Field( diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query.py index 90d23995902d..306ec32d8519 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_service.py index 44db4975b6ce..dfc75bbe9aa5 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_service.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set.py index 83ae097221ad..7efae648e3a3 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py index 1dab3c6377bd..617c6a3c1f3c 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/sample_query_set_service.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -135,12 +136,12 @@ class ListSampleQuerySetsResponse(proto.Message): def raw_page(self): return self - sample_query_sets: MutableSequence[ - gcd_sample_query_set.SampleQuerySet - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_sample_query_set.SampleQuerySet, + sample_query_sets: MutableSequence[gcd_sample_query_set.SampleQuerySet] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_sample_query_set.SampleQuerySet, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema.py index 26a07ce369a8..b44363da031e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore +from google.protobuf import struct_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema_service.py index 42437b4bf244..ac23e743a267 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/schema_service.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py index a8bd37079766..439818ad8237 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_service.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import struct_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import chunk as gcd_chunk from google.cloud.discoveryengine_v1beta.types import common from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.protobuf import struct_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -64,11 +65,11 @@ class SearchRequest(proto.Message): Values above the maximum value are coerced to the maximum value. - - Websites with basic indexing: Default ``10``, Maximum - ``25``. - - Websites with advanced indexing: Default ``25``, Maximum - ``50``. - - Other: Default ``50``, Maximum ``100``. + - Websites with basic indexing: Default ``10``, Maximum + ``25``. + - Websites with advanced indexing: Default ``25``, Maximum + ``50``. + - Other: Default ``50``, Maximum ``100``. If this field is negative, an ``INVALID_ARGUMENT`` is returned. @@ -184,18 +185,18 @@ class SearchRequest(proto.Message): For public website search only, supported values are: - - ``user_country_code``: string. Default empty. If set to - non-empty, results are restricted or boosted based on the - location provided. For example, - ``user_country_code: "au"`` + - ``user_country_code``: string. Default empty. If set to + non-empty, results are restricted or boosted based on the + location provided. For example, + ``user_country_code: "au"`` - For available codes see `Country - Codes `__ + For available codes see `Country + Codes `__ - - ``search_type``: double. Default empty. Enables - non-webpage searching depending on the value. The only - valid non-default value is 1, which enables image - searching. For example, ``search_type: 1`` + - ``search_type``: double. Default empty. Enables + non-webpage searching depending on the value. The only + valid non-default value is 1, which enables image + searching. For example, ``search_type: 1`` query_expansion_spec (google.cloud.discoveryengine_v1beta.types.SearchRequest.QueryExpansionSpec): The query expansion specification that specifies the conditions under which query @@ -252,21 +253,21 @@ class SearchRequest(proto.Message): be a single function or multiple functions that are joined by "+". - - ranking_expression = function, { " + ", function }; + - ranking_expression = function, { " + ", function }; Supported functions: - - double \* relevance_score - - double \* dotProduct(embedding_field_path) + - double \* relevance_score + - double \* dotProduct(embedding_field_path) Function variables: - - ``relevance_score``: pre-defined keywords, used for - measure relevance between query and document. - - ``embedding_field_path``: the document embedding field - used with query embedding vector. - - ``dotProduct``: embedding function between - ``embedding_field_path`` and query embedding vector. + - ``relevance_score``: pre-defined keywords, used for + measure relevance between query and document. + - ``embedding_field_path``: the document embedding field + used with query embedding vector. + - ``dotProduct``: embedding function between + ``embedding_field_path`` and query embedding vector. Example ranking expression: @@ -280,66 +281,68 @@ class SearchRequest(proto.Message): is set to ``RANK_BY_FORMULA``, the following expression types (and combinations of those chained using + or - - operators) are supported: - - - ``double`` - - ``signal`` - - ``log(signal)`` - - ``exp(signal)`` - - ``rr(signal, double > 0)`` -- reciprocal rank - transformation with second argument being a denominator - constant. - - ``is_nan(signal)`` -- returns 0 if signal is NaN, 1 - otherwise. - - ``fill_nan(signal1, signal2 | double)`` -- if signal1 is - NaN, returns signal2 \| double, else returns signal1. - - Here are a few examples of ranking formulas that use the - supported ranking expression types: - - - ``0.2 * semantic_similarity_score + 0.8 * log(keyword_similarity_score)`` - -- mostly rank by the logarithm of - ``keyword_similarity_score`` with slight - ``semantic_smilarity_score`` adjustment. - - ``0.2 * exp(fill_nan(semantic_similarity_score, 0)) + 0.3 * is_nan(keyword_similarity_score)`` - -- rank by the exponent of ``semantic_similarity_score`` - filling the value with 0 if it's NaN, also add constant - 0.3 adjustment to the final score if - ``semantic_similarity_score`` is NaN. - - ``0.2 * rr(semantic_similarity_score, 16) + 0.8 * rr(keyword_similarity_score, 16)`` - -- mostly rank by the reciprocal rank of - ``keyword_similarity_score`` with slight adjustment of - reciprocal rank of ``semantic_smilarity_score``. + - operators) are supported: + + - ``double`` + - ``signal`` + - ``log(signal)`` + - ``exp(signal)`` + - ``rr(signal, double > 0)`` -- reciprocal rank + transformation with second argument being a + denominator constant. + - ``is_nan(signal)`` -- returns 0 if signal is NaN, 1 + otherwise. + - ``fill_nan(signal1, signal2 | double)`` -- if signal1 + is NaN, returns signal2 \| double, else returns + signal1. + + Here are a few examples of ranking formulas that use the + supported ranking expression types: + + - ``0.2 * semantic_similarity_score + 0.8 * log(keyword_similarity_score)`` + -- mostly rank by the logarithm of + ``keyword_similarity_score`` with slight + ``semantic_smilarity_score`` adjustment. + - ``0.2 * exp(fill_nan(semantic_similarity_score, 0)) + 0.3 * is_nan(keyword_similarity_score)`` + -- rank by the exponent of + ``semantic_similarity_score`` filling the value with 0 + if it's NaN, also add constant 0.3 adjustment to the + final score if ``semantic_similarity_score`` is NaN. + - ``0.2 * rr(semantic_similarity_score, 16) + 0.8 * rr(keyword_similarity_score, 16)`` + -- mostly rank by the reciprocal rank of + ``keyword_similarity_score`` with slight adjustment of + reciprocal rank of ``semantic_smilarity_score``. The following signals are supported: - - ``semantic_similarity_score``: semantic similarity - adjustment that is calculated using the embeddings - generated by a proprietary Google model. This score - determines how semantically similar a search query is to a - document. - - ``keyword_similarity_score``: keyword match adjustment - uses the Best Match 25 (BM25) ranking function. This score - is calculated using a probabilistic model to estimate the - probability that a document is relevant to a given query. - - ``relevance_score``: semantic relevance adjustment that - uses a proprietary Google model to determine the meaning - and intent behind a user's query in context with the - content in the documents. - - ``pctr_rank``: predicted conversion rate adjustment as a - rank use predicted Click-through rate (pCTR) to gauge the - relevance and attractiveness of a search result from a - user's perspective. A higher pCTR suggests that the result - is more likely to satisfy the user's query and intent, - making it a valuable signal for ranking. - - ``freshness_rank``: freshness adjustment as a rank - - ``document_age``: The time in hours elapsed since the - document was last updated, a floating-point number (e.g., - 0.25 means 15 minutes). - - ``topicality_rank``: topicality adjustment as a rank. Uses - proprietary Google model to determine the keyword-based - overlap between the query and the document. - - ``base_rank``: the default rank of the result + - ``semantic_similarity_score``: semantic similarity + adjustment that is calculated using the embeddings + generated by a proprietary Google model. This score + determines how semantically similar a search query is to + a document. + - ``keyword_similarity_score``: keyword match adjustment + uses the Best Match 25 (BM25) ranking function. This + score is calculated using a probabilistic model to + estimate the probability that a document is relevant to a + given query. + - ``relevance_score``: semantic relevance adjustment that + uses a proprietary Google model to determine the meaning + and intent behind a user's query in context with the + content in the documents. + - ``pctr_rank``: predicted conversion rate adjustment as a + rank use predicted Click-through rate (pCTR) to gauge the + relevance and attractiveness of a search result from a + user's perspective. A higher pCTR suggests that the + result is more likely to satisfy the user's query and + intent, making it a valuable signal for ranking. + - ``freshness_rank``: freshness adjustment as a rank + - ``document_age``: The time in hours elapsed since the + document was last updated, a floating-point number (e.g., + 0.25 means 15 minutes). + - ``topicality_rank``: topicality adjustment as a rank. + Uses proprietary Google model to determine the + keyword-based overlap between the query and the document. + - ``base_rank``: the default rank of the result ranking_expression_backend (google.cloud.discoveryengine_v1beta.types.SearchRequest.RankingExpressionBackend): The backend to use for the ranking expression evaluation. @@ -350,20 +353,20 @@ class SearchRequest(proto.Message): The user labels applied to a resource must meet the following requirements: - - Each resource can have multiple labels, up to a maximum of - 64. - - Each label must be a key-value pair. - - Keys have a minimum length of 1 character and a maximum - length of 63 characters and cannot be empty. Values can be - empty and have a maximum length of 63 characters. - - Keys and values can contain only lowercase letters, - numeric characters, underscores, and dashes. All - characters must use UTF-8 encoding, and international - characters are allowed. - - The key portion of a label must be unique. However, you - can use the same key with multiple resources. - - Keys must start with a lowercase letter or international - character. + - Each resource can have multiple labels, up to a maximum + of 64. + - Each label must be a key-value pair. + - Keys have a minimum length of 1 character and a maximum + length of 63 characters and cannot be empty. Values can + be empty and have a maximum length of 63 characters. + - Keys and values can contain only lowercase letters, + numeric characters, underscores, and dashes. All + characters must use UTF-8 encoding, and international + characters are allowed. + - The key portion of a label must be unique. However, you + can use the same key with multiple resources. + - Keys must start with a lowercase letter or international + character. See `Google Cloud Document `__ @@ -448,6 +451,7 @@ class RelevanceThreshold(proto.Enum): HIGH (4): High relevance threshold. """ + RELEVANCE_THRESHOLD_UNSPECIFIED = 0 LOWEST = 1 LOW = 2 @@ -467,6 +471,7 @@ class RankingExpressionBackend(proto.Enum): RANK_BY_FORMULA (4): Ranking by custom formula. """ + RANKING_EXPRESSION_BACKEND_UNSPECIFIED = 0 RANK_BY_EMBEDDING = 3 RANK_BY_FORMULA = 4 @@ -584,11 +589,11 @@ class FacetSpec(proto.Message): Another example, assuming you have the following facets in the request: - - "rating", enable_dynamic_position = true + - "rating", enable_dynamic_position = true - - "price", enable_dynamic_position = false + - "price", enable_dynamic_position = false - - "brands", enable_dynamic_position = false + - "brands", enable_dynamic_position = false And also you have a dynamic facets enabled, which generates a facet ``gender``. Then the final order of the facets in @@ -647,13 +652,13 @@ class FacetKey(proto.Message): Allowed values are: - - "count desc", which means order by - [SearchResponse.Facet.values.count][google.cloud.discoveryengine.v1beta.SearchResponse.Facet.FacetValue.count] - descending. + - "count desc", which means order by + [SearchResponse.Facet.values.count][google.cloud.discoveryengine.v1beta.SearchResponse.Facet.FacetValue.count] + descending. - - "value desc", which means order by - [SearchResponse.Facet.values.value][google.cloud.discoveryengine.v1beta.SearchResponse.Facet.FacetValue.value] - descending. Only applies to textual facets. + - "value desc", which means order by + [SearchResponse.Facet.values.value][google.cloud.discoveryengine.v1beta.SearchResponse.Facet.FacetValue.value] + descending. Only applies to textual facets. If not set, textual values are sorted in `natural order `__; @@ -735,9 +740,9 @@ class ConditionBoostSpec(proto.Message): Examples: - - To boost documents with document ID "doc_1" or "doc_2", - and color "Red" or "Blue": - ``(document_id: ANY("doc_1", "doc_2")) AND (color: ANY("Red", "Blue"))`` + - To boost documents with document ID "doc_1" or "doc_2", + and color "Red" or "Blue": + ``(document_id: ANY("doc_1", "doc_2")) AND (color: ANY("Red", "Blue"))`` boost (float): Strength of the condition boost, which should be in [-1, 1]. Negative boost means demotion. Default is 0.0. @@ -812,6 +817,7 @@ class AttributeType(proto.Enum): ``[nD][T[nH][nM][nS]]``. For example, ``5D``, ``3DT12H30M``, ``T24H``. """ + ATTRIBUTE_TYPE_UNSPECIFIED = 0 NUMERICAL = 1 FRESHNESS = 2 @@ -828,6 +834,7 @@ class InterpolationType(proto.Enum): Piecewise linear interpolation will be applied. """ + INTERPOLATION_TYPE_UNSPECIFIED = 0 LINEAR = 1 @@ -937,6 +944,7 @@ class Condition(proto.Enum): Automatic query expansion built by the Search API. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 AUTO = 2 @@ -980,6 +988,7 @@ class Mode(proto.Enum): Search API. Search will be based on the corrected query if found. """ + MODE_UNSPECIFIED = 0 SUGGESTION_ONLY = 1 AUTO = 2 @@ -1029,6 +1038,7 @@ class SearchResultMode(proto.Enum): [DataStore.DocumentProcessingConfig.chunking_config][] is specified. """ + SEARCH_RESULT_MODE_UNSPECIFIED = 0 DOCUMENTS = 1 CHUNKS = 2 @@ -1195,15 +1205,15 @@ class ModelSpec(proto.Message): Supported values are: - - ``stable``: string. Default value when no value is - specified. Uses a generally available, fine-tuned model. - For more information, see `Answer generation model - versions and - lifecycle `__. - - ``preview``: string. (Public preview) Uses a preview - model. For more information, see `Answer generation model - versions and - lifecycle `__. + - ``stable``: string. Default value when no value is + specified. Uses a generally available, fine-tuned model. + For more information, see `Answer generation model + versions and + lifecycle `__. + - ``preview``: string. (Public preview) Uses a preview + model. For more information, see `Answer generation model + versions and + lifecycle `__. """ version: str = proto.Field( @@ -1456,6 +1466,7 @@ class FilterExtractionCondition(proto.Enum): ENABLED (2): Enables NL filter extraction. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1465,11 +1476,11 @@ class FilterExtractionCondition(proto.Enum): number=1, enum="SearchRequest.NaturalLanguageQueryUnderstandingSpec.FilterExtractionCondition", ) - geo_search_query_detection_field_names: MutableSequence[ - str - ] = proto.RepeatedField( - proto.STRING, - number=2, + geo_search_query_detection_field_names: MutableSequence[str] = ( + proto.RepeatedField( + proto.STRING, + number=2, + ) ) class SearchAsYouTypeSpec(proto.Message): @@ -1495,6 +1506,7 @@ class Condition(proto.Enum): ENABLED (2): Enables Search As You Type. """ + CONDITION_UNSPECIFIED = 0 DISABLED = 1 ENABLED = 2 @@ -1586,6 +1598,7 @@ class Mode(proto.Enum): DISABLED (2): Disable personalization. """ + MODE_UNSPECIFIED = 0 AUTO = 1 DISABLED = 2 @@ -2037,12 +2050,12 @@ class FacetValue(proto.Message): proto.STRING, number=1, ) - values: MutableSequence[ - "SearchResponse.Facet.FacetValue" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.Facet.FacetValue", + values: MutableSequence["SearchResponse.Facet.FacetValue"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.Facet.FacetValue", + ) ) dynamic_facet: bool = proto.Field( proto.BOOL, @@ -2177,6 +2190,7 @@ class SummarySkippedReason(proto.Enum): [SearchRequest.ContentSearchSpec.SummarySpec.ignore_non_answer_seeking_query] is set to ``true``. """ + SUMMARY_SKIPPED_REASON_UNSPECIFIED = 0 ADVERSARIAL_QUERY_IGNORED = 1 NON_SUMMARY_SEEKING_QUERY_IGNORED = 2 @@ -2220,12 +2234,12 @@ class CitationMetadata(proto.Message): Citations for segments. """ - citations: MutableSequence[ - "SearchResponse.Summary.Citation" - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message="SearchResponse.Summary.Citation", + citations: MutableSequence["SearchResponse.Summary.Citation"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message="SearchResponse.Summary.Citation", + ) ) class Citation(proto.Message): @@ -2249,12 +2263,12 @@ class Citation(proto.Message): proto.INT64, number=2, ) - sources: MutableSequence[ - "SearchResponse.Summary.CitationSource" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.CitationSource", + sources: MutableSequence["SearchResponse.Summary.CitationSource"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.CitationSource", + ) ) class CitationSource(proto.Message): @@ -2352,12 +2366,12 @@ class SummaryWithMetadata(proto.Message): number=2, message="SearchResponse.Summary.CitationMetadata", ) - references: MutableSequence[ - "SearchResponse.Summary.Reference" - ] = proto.RepeatedField( - proto.MESSAGE, - number=3, - message="SearchResponse.Summary.Reference", + references: MutableSequence["SearchResponse.Summary.Reference"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=3, + message="SearchResponse.Summary.Reference", + ) ) summary_text: str = proto.Field( @@ -2526,6 +2540,7 @@ class Comparison(proto.Enum): GREATER_THAN (5): Denotes greater than ``>`` operator. """ + COMPARISON_UNSPECIFIED = 0 EQUALS = 1 LESS_THAN_EQUALS = 2 @@ -2772,6 +2787,7 @@ class OneBoxType(proto.Enum): One Box result contains Knowledge Graph search responses. """ + ONE_BOX_TYPE_UNSPECIFIED = 0 PEOPLE = 1 ORGANIZATION = 2 @@ -2783,12 +2799,12 @@ class OneBoxType(proto.Enum): number=1, enum="SearchResponse.OneBoxResult.OneBoxType", ) - search_results: MutableSequence[ - "SearchResponse.SearchResult" - ] = proto.RepeatedField( - proto.MESSAGE, - number=2, - message="SearchResponse.SearchResult", + search_results: MutableSequence["SearchResponse.SearchResult"] = ( + proto.RepeatedField( + proto.MESSAGE, + number=2, + message="SearchResponse.SearchResult", + ) ) @property diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py index ca1b175ba108..b78375a37892 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/search_tuning_service.py @@ -17,11 +17,13 @@ from typing import MutableMapping, MutableSequence +import proto # type: ignore + +from google.cloud.discoveryengine_v1beta.types import custom_tuning_model +from google.cloud.discoveryengine_v1beta.types import import_config from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore -import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import custom_tuning_model, import_config __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -65,12 +67,12 @@ class ListCustomModelsResponse(proto.Message): List of custom tuning models. """ - models: MutableSequence[ - custom_tuning_model.CustomTuningModel - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=custom_tuning_model.CustomTuningModel, + models: MutableSequence[custom_tuning_model.CustomTuningModel] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=custom_tuning_model.CustomTuningModel, + ) ) @@ -95,8 +97,8 @@ class TrainCustomModelRequest(proto.Message): model_type (str): Model to be trained. Supported values are: - - **search-tuning**: Fine tuning the search system based on - data provided. + - **search-tuning**: Fine tuning the search system based on + data provided. error_config (google.cloud.discoveryengine_v1beta.types.ImportErrorConfig): The desired location of errors incurred during the data ingestion and training. @@ -136,8 +138,8 @@ class GcsTrainingInput(proto.Message): number in ``[0, inf+)``. The larger the number is, the more relevant the pair is. Example: - - ``query-id\tcorpus-id\tscore`` - - ``query1\tdoc1\t1`` + - ``query-id\tcorpus-id\tscore`` + - ``query1\tdoc1\t1`` test_data_path (str): Cloud Storage test data. Same format as train_data_path. If not provided, a random 80/20 train/test split will be @@ -202,15 +204,15 @@ class TrainCustomModelResponse(proto.Message): model_status (str): The trained model status. Possible values are: - - **bad-data**: The training data quality is bad. - - **no-improvement**: Tuning didn't improve performance. - Won't deploy. - - **in-progress**: Model training job creation is in - progress. - - **training**: Model is actively training. - - **evaluating**: The model is evaluating trained metrics. - - **indexing**: The model trained metrics are indexing. - - **ready**: The model is ready for serving. + - **bad-data**: The training data quality is bad. + - **no-improvement**: Tuning didn't improve performance. + Won't deploy. + - **in-progress**: Model training job creation is in + progress. + - **training**: Model is actively training. + - **evaluating**: The model is evaluating trained metrics. + - **indexing**: The model trained metrics are indexing. + - **ready**: The model is ready for serving. metrics (MutableMapping[str, float]): The metrics of the trained model. model_name (str): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config.py index c518f8a9b3f9..38dd62993eb7 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config.py @@ -17,10 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore -from google.cloud.discoveryengine_v1beta.types import common, search_service +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import search_service +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -82,11 +84,11 @@ class ServingConfig(proto.Message): e.g. ``medium-diversity`` or ``high-diversity``. Currently supported values: - - ``no-diversity`` - - ``low-diversity`` - - ``medium-diversity`` - - ``high-diversity`` - - ``auto-diversity`` + - ``no-diversity`` + - ``low-diversity`` + - ``medium-diversity`` + - ``high-diversity`` + - ``auto-diversity`` If not specified, we choose default based on recommendation model type. Default value: ``no-diversity``. @@ -118,21 +120,21 @@ class ServingConfig(proto.Message): The ranking expression is a single function or multiple functions that are joined by "+". - - ranking_expression = function, { " + ", function }; + - ranking_expression = function, { " + ", function }; Supported functions: - - double \* relevance_score - - double \* dotProduct(embedding_field_path) + - double \* relevance_score + - double \* dotProduct(embedding_field_path) Function variables: - - ``relevance_score``: pre-defined keywords, used for - measure relevance between query and document. - - ``embedding_field_path``: the document embedding field - used with query embedding vector. - - ``dotProduct``: embedding function between - embedding_field_path and query embedding vector. + - ``relevance_score``: pre-defined keywords, used for + measure relevance between query and document. + - ``embedding_field_path``: the document embedding field + used with query embedding vector. + - ``dotProduct``: embedding function between + embedding_field_path and query embedding vector. Example ranking expression: @@ -226,20 +228,20 @@ class MediaConfig(proto.Message): r"""Specifies the configurations needed for Media Discovery. Currently we support: - - ``demote_content_watched``: Threshold for watched content - demotion. Customers can specify if using watched content demotion - or use viewed detail page. Using the content watched demotion, - customers need to specify the watched minutes or percentage - exceeds the threshold, the content will be demoted in the - recommendation result. - - ``promote_fresh_content``: cutoff days for fresh content - promotion. Customers can specify if using content freshness - promotion. If the content was published within the cutoff days, - the content will be promoted in the recommendation result. Can - only be set if - [SolutionType][google.cloud.discoveryengine.v1beta.SolutionType] - is - [SOLUTION_TYPE_RECOMMENDATION][google.cloud.discoveryengine.v1beta.SolutionType.SOLUTION_TYPE_RECOMMENDATION]. + - ``demote_content_watched``: Threshold for watched content + demotion. Customers can specify if using watched content demotion + or use viewed detail page. Using the content watched demotion, + customers need to specify the watched minutes or percentage + exceeds the threshold, the content will be demoted in the + recommendation result. + - ``promote_fresh_content``: cutoff days for fresh content + promotion. Customers can specify if using content freshness + promotion. If the content was published within the cutoff days, + the content will be promoted in the recommendation result. Can + only be set if + [SolutionType][google.cloud.discoveryengine.v1beta.SolutionType] + is + [SOLUTION_TYPE_RECOMMENDATION][google.cloud.discoveryengine.v1beta.SolutionType.SOLUTION_TYPE_RECOMMENDATION]. This message has `oneof`_ fields (mutually exclusive fields). For each oneof, at most one member field can be set at the same time. @@ -264,11 +266,11 @@ class MediaConfig(proto.Message): Specifies the event type used for demoting recommendation result. Currently supported values: - - ``view-item``: Item viewed. - - ``media-play``: Start/resume watching a video, playing a - song, etc. - - ``media-complete``: Finished or stopped midway through a - video, song, etc. + - ``view-item``: Item viewed. + - ``media-play``: Start/resume watching a video, playing a + song, etc. + - ``media-complete``: Finished or stopped midway through a + video, song, etc. If unset, watch history demotion will not be applied. Content freshness demotion will still be applied. @@ -311,7 +313,8 @@ class GenericConfig(proto.Message): r"""Specifies the configurations needed for Generic Discovery.Currently we support: - - ``content_search_spec``: configuration for generic content search. + - ``content_search_spec``: configuration for generic content + search. Attributes: content_search_spec (google.cloud.discoveryengine_v1beta.types.SearchRequest.ContentSearchSpec): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py index 2701dec76cc8..361a8e930fd1 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/serving_config_service.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) +from google.protobuf import field_mask_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -46,7 +47,7 @@ class UpdateServingConfigRequest(proto.Message): [ServingConfig][google.cloud.discoveryengine.v1beta.ServingConfig] to update. The following are NOT supported: - - [ServingConfig.name][google.cloud.discoveryengine.v1beta.ServingConfig.name] + - [ServingConfig.name][google.cloud.discoveryengine.v1beta.ServingConfig.name] If not set, all supported fields are updated. """ @@ -126,12 +127,12 @@ class ListServingConfigsResponse(proto.Message): def raw_page(self): return self - serving_configs: MutableSequence[ - gcd_serving_config.ServingConfig - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_serving_config.ServingConfig, + serving_configs: MutableSequence[gcd_serving_config.ServingConfig] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_serving_config.ServingConfig, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py index 013ee90b77c4..64e16c8ffe8d 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session.py @@ -17,10 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import answer as gcd_answer +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -69,6 +70,7 @@ class State(proto.Enum): IN_PROGRESS (1): The session is currently open. """ + STATE_UNSPECIFIED = 0 IN_PROGRESS = 1 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session_service.py index 589f350cf1e3..d3a79e0ec197 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/session_service.py @@ -15,6 +15,7 @@ # import proto # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={}, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py index 87bb9aa78b38..e6f4838cd121 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine.py @@ -17,9 +17,11 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ @@ -103,6 +105,7 @@ class Type(proto.Enum): EXCLUDE (2): Exclude the target site. """ + TYPE_UNSPECIFIED = 0 INCLUDE = 1 EXCLUDE = 2 @@ -130,6 +133,7 @@ class IndexingStatus(proto.Enum): 2. state reverts to SUCCEEDED if the unindexing fails. """ + INDEXING_STATUS_UNSPECIFIED = 0 PENDING = 1 FAILED = 2 @@ -244,6 +248,7 @@ class SiteVerificationState(proto.Enum): Site exempt from verification, e.g., a public website that opens to all. """ + SITE_VERIFICATION_STATE_UNSPECIFIED = 0 VERIFIED = 1 UNVERIFIED = 2 diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py index 2db134f26036..12f6f2ed7822 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/site_search_engine_service.py @@ -17,12 +17,13 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import ( site_search_engine as gcd_site_search_engine, ) +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -371,12 +372,12 @@ class ListTargetSitesResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, @@ -424,12 +425,12 @@ class BatchCreateTargetSitesResponse(proto.Message): TargetSites created. """ - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) @@ -838,6 +839,7 @@ class CorpusType(proto.Enum): Denotes a crawling attempt for the mobile version of a page. """ + CORPUS_TYPE_UNSPECIFIED = 0 DESKTOP = 1 MOBILE = 2 @@ -1079,12 +1081,12 @@ class FetchDomainVerificationStatusResponse(proto.Message): def raw_page(self): return self - target_sites: MutableSequence[ - gcd_site_search_engine.TargetSite - ] = proto.RepeatedField( - proto.MESSAGE, - number=1, - message=gcd_site_search_engine.TargetSite, + target_sites: MutableSequence[gcd_site_search_engine.TargetSite] = ( + proto.RepeatedField( + proto.MESSAGE, + number=1, + message=gcd_site_search_engine.TargetSite, + ) ) next_page_token: str = proto.Field( proto.STRING, diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event.py index 5c7918c4a605..256fd65bda47 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event.py @@ -17,11 +17,12 @@ from typing import MutableMapping, MutableSequence -from google.protobuf import duration_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore from google.cloud.discoveryengine_v1beta.types import common +from google.protobuf import duration_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", @@ -49,27 +50,27 @@ class UserEvent(proto.Message): Generic values: - - ``search``: Search for Documents. - - ``view-item``: Detailed page view of a Document. - - ``view-item-list``: View of a panel or ordered list of - Documents. - - ``view-home-page``: View of the home page. - - ``view-category-page``: View of a category page, e.g. Home - > Men > Jeans - - ``add-feedback``: Add a user feedback. + - ``search``: Search for Documents. + - ``view-item``: Detailed page view of a Document. + - ``view-item-list``: View of a panel or ordered list of + Documents. + - ``view-home-page``: View of the home page. + - ``view-category-page``: View of a category page, e.g. + Home > Men > Jeans + - ``add-feedback``: Add a user feedback. Retail-related values: - - ``add-to-cart``: Add an item(s) to cart, e.g. in Retail - online shopping - - ``purchase``: Purchase an item(s) + - ``add-to-cart``: Add an item(s) to cart, e.g. in Retail + online shopping + - ``purchase``: Purchase an item(s) Media-related values: - - ``media-play``: Start/resume watching a video, playing a - song, etc. - - ``media-complete``: Finished or stopped midway through a - video, song, etc. + - ``media-play``: Start/resume watching a video, playing a + song, etc. + - ``media-complete``: Finished or stopped midway through a + video, song, etc. user_pseudo_id (str): Required. A unique identifier for tracking visitors. @@ -159,12 +160,12 @@ class UserEvent(proto.Message): The value must be one of: - - [RecommendResponse.attribution_token][google.cloud.discoveryengine.v1beta.RecommendResponse.attribution_token] - for events that are the result of - [RecommendationService.Recommend][google.cloud.discoveryengine.v1beta.RecommendationService.Recommend]. - - [SearchResponse.attribution_token][google.cloud.discoveryengine.v1beta.SearchResponse.attribution_token] - for events that are the result of - [SearchService.Search][google.cloud.discoveryengine.v1beta.SearchService.Search]. + - [RecommendResponse.attribution_token][google.cloud.discoveryengine.v1beta.RecommendResponse.attribution_token] + for events that are the result of + [RecommendationService.Recommend][google.cloud.discoveryengine.v1beta.RecommendationService.Recommend]. + - [SearchResponse.attribution_token][google.cloud.discoveryengine.v1beta.SearchResponse.attribution_token] + for events that are the result of + [SearchService.Search][google.cloud.discoveryengine.v1beta.SearchService.Search]. This token enables us to accurately attribute page view or conversion completion back to the event and the particular @@ -204,11 +205,11 @@ class UserEvent(proto.Message): This field is optional except for the following event types: - - ``view-item`` - - ``add-to-cart`` - - ``purchase`` - - ``media-play`` - - ``media-complete`` + - ``view-item`` + - ``add-to-cart`` + - ``purchase`` + - ``media-play`` + - ``media-complete`` In a ``search`` event, this field represents the documents returned to the end user on the current page (the end user @@ -262,12 +263,12 @@ class UserEvent(proto.Message): This field needs to pass all below criteria, otherwise an ``INVALID_ARGUMENT`` error is returned: - - The key must be a UTF-8 encoded string with a length limit - of 5,000 characters. - - For text attributes, at most 400 values are allowed. Empty - values are not allowed. Each value must be a UTF-8 encoded - string with a length limit of 256 characters. - - For number attributes, at most 400 values are allowed. + - The key must be a UTF-8 encoded string with a length + limit of 5,000 characters. + - For text attributes, at most 400 values are allowed. + Empty values are not allowed. Each value must be a UTF-8 + encoded string with a length limit of 256 characters. + - For number attributes, at most 400 values are allowed. For product recommendations, an example of extra user information is ``traffic_channel``, which is how a user @@ -571,12 +572,12 @@ class TransactionInfo(proto.Message): manufacturing costs, shipping expenses not borne by the end user, or any other costs, such that: - - Profit = - [value][google.cloud.discoveryengine.v1beta.TransactionInfo.value] - - - [tax][google.cloud.discoveryengine.v1beta.TransactionInfo.tax] - - - [cost][google.cloud.discoveryengine.v1beta.TransactionInfo.cost] + - Profit = + [value][google.cloud.discoveryengine.v1beta.TransactionInfo.value] + - + [tax][google.cloud.discoveryengine.v1beta.TransactionInfo.tax] + - + [cost][google.cloud.discoveryengine.v1beta.TransactionInfo.cost] This field is a member of `oneof`_ ``_cost``. discount_value (float): @@ -598,12 +599,12 @@ class TransactionInfo(proto.Message): can be larger than [TransactionInfo.value][google.cloud.discoveryengine.v1beta.TransactionInfo.value]: - - Profit = - [value][google.cloud.discoveryengine.v1beta.TransactionInfo.value] - - - [tax][google.cloud.discoveryengine.v1beta.TransactionInfo.tax] - - - [cost][google.cloud.discoveryengine.v1beta.TransactionInfo.cost] + - Profit = + [value][google.cloud.discoveryengine.v1beta.TransactionInfo.value] + - + [tax][google.cloud.discoveryengine.v1beta.TransactionInfo.tax] + - + [cost][google.cloud.discoveryengine.v1beta.TransactionInfo.cost] This field is a member of `oneof`_ ``_discount_value``. """ @@ -674,8 +675,8 @@ class DocumentInfo(proto.Message): Required for events of the following event types: - - ``add-to-cart`` - - ``purchase`` + - ``add-to-cart`` + - ``purchase`` This field is a member of `oneof`_ ``_quantity``. promotion_ids (MutableSequence[str]): diff --git a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event_service.py b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event_service.py index 8be711e32aeb..0ac12a344e2e 100644 --- a/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event_service.py +++ b/packages/google-cloud-discoveryengine/google/cloud/discoveryengine_v1beta/types/user_event_service.py @@ -21,6 +21,7 @@ from google.cloud.discoveryengine_v1beta.types import user_event as gcd_user_event + __protobuf__ = proto.module( package="google.cloud.discoveryengine.v1beta", manifest={ diff --git a/packages/google-cloud-discoveryengine/noxfile.py b/packages/google-cloud-discoveryengine/noxfile.py index b1aa5da98074..773b1692fe67 100644 --- a/packages/google-cloud-discoveryengine/noxfile.py +++ b/packages/google-cloud-discoveryengine/noxfile.py @@ -17,6 +17,7 @@ import pathlib import re import shutil + from typing import Dict, List import warnings diff --git a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1.json b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1.json index 061eb71645ed..af933896aabc 100644 --- a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1.json +++ b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-discoveryengine", - "version": "0.15.0" + "version": "0.4.0" }, "snippets": [ { diff --git a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1alpha.json b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1alpha.json index 8c60b426a4b1..b70a65161aa1 100644 --- a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1alpha.json +++ b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1alpha.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-discoveryengine", - "version": "0.15.0" + "version": "0.4.0" }, "snippets": [ { diff --git a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1beta.json b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1beta.json index 9c186ac39682..b2d0a745ffa9 100644 --- a/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1beta.json +++ b/packages/google-cloud-discoveryengine/samples/generated_samples/snippet_metadata_google.cloud.discoveryengine.v1beta.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-discoveryengine", - "version": "0.15.0" + "version": "0.4.0" }, "snippets": [ { diff --git a/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1_keywords.py b/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1_keywords.py index 70415cfeca9b..a14a844a2187 100644 --- a/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1_keywords.py +++ b/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1_keywords.py @@ -19,12 +19,11 @@ import libcst as cst import pathlib import sys -from typing import (Any, Callable, Dict, List, Sequence, Tuple) +from typing import Any, Callable, Dict, List, Sequence, Tuple def partition( - predicate: Callable[[Any], bool], - iterator: Sequence[Any] + predicate: Callable[[Any], bool], iterator: Sequence[Any] ) -> Tuple[List[Any], List[Any]]: """A stable, out-of-place partition.""" results = ([], []) @@ -37,99 +36,467 @@ def partition( class discoveryengineCallTransformer(cst.CSTTransformer): - CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') + CTRL_PARAMS: Tuple[str] = ("retry", "timeout", "metadata") METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'answer_query': ('serving_config', 'query', 'session', 'safety_spec', 'related_questions_spec', 'grounding_spec', 'answer_generation_spec', 'search_spec', 'query_understanding_spec', 'asynchronous_mode', 'user_pseudo_id', 'user_labels', 'end_user_spec', ), - 'batch_create_target_sites': ('parent', 'requests', ), - 'batch_get_documents_metadata': ('parent', 'matcher', ), - 'batch_update_user_licenses': ('parent', 'inline_source', 'delete_unassigned_user_licenses', ), - 'batch_verify_target_sites': ('parent', ), - 'check_grounding': ('grounding_config', 'answer_candidate', 'facts', 'grounding_spec', 'user_labels', ), - 'collect_user_event': ('parent', 'user_event', 'uri', 'ets', ), - 'complete_query': ('data_store', 'query', 'query_model', 'user_pseudo_id', 'include_tail_suggestions', ), - 'converse_conversation': ('name', 'query', 'serving_config', 'conversation', 'safe_search', 'user_labels', 'summary_spec', 'filter', 'boost_spec', ), - 'create_control': ('parent', 'control', 'control_id', ), - 'create_conversation': ('parent', 'conversation', ), - 'create_data_store': ('parent', 'data_store', 'data_store_id', 'cmek_config_name', 'disable_cmek', 'create_advanced_site_search', 'skip_default_schema_creation', ), - 'create_document': ('parent', 'document', 'document_id', ), - 'create_engine': ('parent', 'engine', 'engine_id', ), - 'create_identity_mapping_store': ('parent', 'identity_mapping_store_id', 'identity_mapping_store', 'cmek_config_name', 'disable_cmek', ), - 'create_schema': ('parent', 'schema', 'schema_id', ), - 'create_session': ('parent', 'session', ), - 'create_sitemap': ('parent', 'sitemap', ), - 'create_target_site': ('parent', 'target_site', ), - 'delete_cmek_config': ('name', ), - 'delete_control': ('name', ), - 'delete_conversation': ('name', ), - 'delete_data_store': ('name', ), - 'delete_document': ('name', ), - 'delete_engine': ('name', ), - 'delete_identity_mapping_store': ('name', ), - 'delete_schema': ('name', ), - 'delete_session': ('name', ), - 'delete_sitemap': ('name', ), - 'delete_target_site': ('name', ), - 'disable_advanced_site_search': ('site_search_engine', ), - 'enable_advanced_site_search': ('site_search_engine', ), - 'fetch_domain_verification_status': ('site_search_engine', 'page_size', 'page_token', ), - 'fetch_sitemaps': ('parent', 'matcher', ), - 'generate_grounded_content': ('location', 'system_instruction', 'contents', 'generation_spec', 'grounding_spec', 'user_labels', ), - 'get_answer': ('name', ), - 'get_cmek_config': ('name', ), - 'get_control': ('name', ), - 'get_conversation': ('name', ), - 'get_data_store': ('name', ), - 'get_document': ('name', ), - 'get_engine': ('name', ), - 'get_identity_mapping_store': ('name', ), - 'get_schema': ('name', ), - 'get_session': ('name', 'include_answer_details', ), - 'get_site_search_engine': ('name', ), - 'get_target_site': ('name', ), - 'import_completion_suggestions': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'error_config', ), - 'import_documents': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'fhir_store_source', 'spanner_source', 'cloud_sql_source', 'firestore_source', 'alloy_db_source', 'bigtable_source', 'error_config', 'reconciliation_mode', 'update_mask', 'auto_generate_ids', 'id_field', 'force_refresh_content', ), - 'import_identity_mappings': ('identity_mapping_store', 'inline_source', ), - 'import_suggestion_deny_list_entries': ('parent', 'inline_source', 'gcs_source', ), - 'import_user_events': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'error_config', ), - 'list_cmek_configs': ('parent', ), - 'list_controls': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_conversations': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_custom_models': ('data_store', ), - 'list_data_stores': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_documents': ('parent', 'page_size', 'page_token', ), - 'list_engines': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_identity_mappings': ('identity_mapping_store', 'page_size', 'page_token', ), - 'list_identity_mapping_stores': ('parent', 'page_size', 'page_token', ), - 'list_schemas': ('parent', 'page_size', 'page_token', ), - 'list_sessions': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_target_sites': ('parent', 'page_size', 'page_token', ), - 'list_user_licenses': ('parent', 'page_size', 'page_token', 'filter', ), - 'provision_project': ('name', 'accept_data_use_terms', 'data_use_terms_version', ), - 'purge_completion_suggestions': ('parent', ), - 'purge_documents': ('parent', 'filter', 'gcs_source', 'inline_source', 'error_config', 'force', ), - 'purge_identity_mappings': ('identity_mapping_store', 'inline_source', 'filter', 'force', ), - 'purge_suggestion_deny_list_entries': ('parent', ), - 'purge_user_events': ('parent', 'filter', 'force', ), - 'rank': ('ranking_config', 'records', 'model', 'top_n', 'query', 'ignore_record_details_in_response', 'user_labels', ), - 'recommend': ('serving_config', 'user_event', 'page_size', 'filter', 'validate_only', 'params', 'user_labels', ), - 'recrawl_uris': ('site_search_engine', 'uris', 'site_credential', ), - 'search': ('serving_config', 'branch', 'query', 'image_query', 'page_size', 'page_token', 'offset', 'one_box_page_size', 'data_store_specs', 'filter', 'canonical_filter', 'order_by', 'user_info', 'language_code', 'facet_specs', 'boost_spec', 'params', 'query_expansion_spec', 'spell_correction_spec', 'user_pseudo_id', 'content_search_spec', 'safe_search', 'user_labels', 'search_as_you_type_spec', 'display_spec', 'session', 'session_spec', 'relevance_threshold', 'relevance_score_spec', 'ranking_expression', 'ranking_expression_backend', ), - 'search_lite': ('serving_config', 'branch', 'query', 'image_query', 'page_size', 'page_token', 'offset', 'one_box_page_size', 'data_store_specs', 'filter', 'canonical_filter', 'order_by', 'user_info', 'language_code', 'facet_specs', 'boost_spec', 'params', 'query_expansion_spec', 'spell_correction_spec', 'user_pseudo_id', 'content_search_spec', 'safe_search', 'user_labels', 'search_as_you_type_spec', 'display_spec', 'session', 'session_spec', 'relevance_threshold', 'relevance_score_spec', 'ranking_expression', 'ranking_expression_backend', ), - 'stream_answer_query': ('serving_config', 'query', 'session', 'safety_spec', 'related_questions_spec', 'grounding_spec', 'answer_generation_spec', 'search_spec', 'query_understanding_spec', 'asynchronous_mode', 'user_pseudo_id', 'user_labels', 'end_user_spec', ), - 'stream_assist': ('name', 'query', 'session', 'user_metadata', 'tools_spec', 'generation_spec', ), - 'stream_generate_grounded_content': ('location', 'system_instruction', 'contents', 'generation_spec', 'grounding_spec', 'user_labels', ), - 'train_custom_model': ('data_store', 'gcs_training_input', 'model_type', 'error_config', 'model_id', ), - 'update_cmek_config': ('config', 'set_default', ), - 'update_control': ('control', 'update_mask', ), - 'update_conversation': ('conversation', 'update_mask', ), - 'update_data_store': ('data_store', 'update_mask', ), - 'update_document': ('document', 'allow_missing', 'update_mask', ), - 'update_engine': ('engine', 'update_mask', ), - 'update_schema': ('schema', 'allow_missing', ), - 'update_serving_config': ('serving_config', 'update_mask', ), - 'update_session': ('session', 'update_mask', ), - 'update_target_site': ('target_site', ), - 'write_user_event': ('parent', 'user_event', 'write_async', ), + "answer_query": ( + "serving_config", + "query", + "session", + "safety_spec", + "related_questions_spec", + "grounding_spec", + "answer_generation_spec", + "search_spec", + "query_understanding_spec", + "asynchronous_mode", + "user_pseudo_id", + "user_labels", + "end_user_spec", + ), + "batch_create_target_sites": ( + "parent", + "requests", + ), + "batch_get_documents_metadata": ( + "parent", + "matcher", + ), + "batch_update_user_licenses": ( + "parent", + "inline_source", + "delete_unassigned_user_licenses", + ), + "batch_verify_target_sites": ("parent",), + "check_grounding": ( + "grounding_config", + "answer_candidate", + "facts", + "grounding_spec", + "user_labels", + ), + "collect_user_event": ( + "parent", + "user_event", + "uri", + "ets", + ), + "complete_query": ( + "data_store", + "query", + "query_model", + "user_pseudo_id", + "include_tail_suggestions", + ), + "converse_conversation": ( + "name", + "query", + "serving_config", + "conversation", + "safe_search", + "user_labels", + "summary_spec", + "filter", + "boost_spec", + ), + "create_control": ( + "parent", + "control", + "control_id", + ), + "create_conversation": ( + "parent", + "conversation", + ), + "create_data_store": ( + "parent", + "data_store", + "data_store_id", + "cmek_config_name", + "disable_cmek", + "create_advanced_site_search", + "skip_default_schema_creation", + ), + "create_document": ( + "parent", + "document", + "document_id", + ), + "create_engine": ( + "parent", + "engine", + "engine_id", + ), + "create_identity_mapping_store": ( + "parent", + "identity_mapping_store_id", + "identity_mapping_store", + "cmek_config_name", + "disable_cmek", + ), + "create_schema": ( + "parent", + "schema", + "schema_id", + ), + "create_session": ( + "parent", + "session", + ), + "create_sitemap": ( + "parent", + "sitemap", + ), + "create_target_site": ( + "parent", + "target_site", + ), + "delete_cmek_config": ("name",), + "delete_control": ("name",), + "delete_conversation": ("name",), + "delete_data_store": ("name",), + "delete_document": ("name",), + "delete_engine": ("name",), + "delete_identity_mapping_store": ("name",), + "delete_schema": ("name",), + "delete_session": ("name",), + "delete_sitemap": ("name",), + "delete_target_site": ("name",), + "disable_advanced_site_search": ("site_search_engine",), + "enable_advanced_site_search": ("site_search_engine",), + "fetch_domain_verification_status": ( + "site_search_engine", + "page_size", + "page_token", + ), + "fetch_sitemaps": ( + "parent", + "matcher", + ), + "generate_grounded_content": ( + "location", + "system_instruction", + "contents", + "generation_spec", + "grounding_spec", + "user_labels", + ), + "get_answer": ("name",), + "get_cmek_config": ("name",), + "get_control": ("name",), + "get_conversation": ("name",), + "get_data_store": ("name",), + "get_document": ("name",), + "get_engine": ("name",), + "get_identity_mapping_store": ("name",), + "get_schema": ("name",), + "get_session": ( + "name", + "include_answer_details", + ), + "get_site_search_engine": ("name",), + "get_target_site": ("name",), + "import_completion_suggestions": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "error_config", + ), + "import_documents": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "fhir_store_source", + "spanner_source", + "cloud_sql_source", + "firestore_source", + "alloy_db_source", + "bigtable_source", + "error_config", + "reconciliation_mode", + "update_mask", + "auto_generate_ids", + "id_field", + "force_refresh_content", + ), + "import_identity_mappings": ( + "identity_mapping_store", + "inline_source", + ), + "import_suggestion_deny_list_entries": ( + "parent", + "inline_source", + "gcs_source", + ), + "import_user_events": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "error_config", + ), + "list_cmek_configs": ("parent",), + "list_controls": ( + "parent", + "page_size", + "page_token", + "filter", + ), + "list_conversations": ( + "parent", + "page_size", + "page_token", + "filter", + "order_by", + ), + "list_custom_models": ("data_store",), + "list_data_stores": ( + "parent", + "page_size", + "page_token", + "filter", + ), + "list_documents": ( + "parent", + "page_size", + "page_token", + ), + "list_engines": ( + "parent", + "page_size", + "page_token", + "filter", + ), + "list_identity_mappings": ( + "identity_mapping_store", + "page_size", + "page_token", + ), + "list_identity_mapping_stores": ( + "parent", + "page_size", + "page_token", + ), + "list_schemas": ( + "parent", + "page_size", + "page_token", + ), + "list_sessions": ( + "parent", + "page_size", + "page_token", + "filter", + "order_by", + ), + "list_target_sites": ( + "parent", + "page_size", + "page_token", + ), + "list_user_licenses": ( + "parent", + "page_size", + "page_token", + "filter", + ), + "provision_project": ( + "name", + "accept_data_use_terms", + "data_use_terms_version", + ), + "purge_completion_suggestions": ("parent",), + "purge_documents": ( + "parent", + "filter", + "gcs_source", + "inline_source", + "error_config", + "force", + ), + "purge_identity_mappings": ( + "identity_mapping_store", + "inline_source", + "filter", + "force", + ), + "purge_suggestion_deny_list_entries": ("parent",), + "purge_user_events": ( + "parent", + "filter", + "force", + ), + "rank": ( + "ranking_config", + "records", + "model", + "top_n", + "query", + "ignore_record_details_in_response", + "user_labels", + ), + "recommend": ( + "serving_config", + "user_event", + "page_size", + "filter", + "validate_only", + "params", + "user_labels", + ), + "recrawl_uris": ( + "site_search_engine", + "uris", + "site_credential", + ), + "search": ( + "serving_config", + "branch", + "query", + "image_query", + "page_size", + "page_token", + "offset", + "one_box_page_size", + "data_store_specs", + "filter", + "canonical_filter", + "order_by", + "user_info", + "language_code", + "facet_specs", + "boost_spec", + "params", + "query_expansion_spec", + "spell_correction_spec", + "user_pseudo_id", + "content_search_spec", + "safe_search", + "user_labels", + "search_as_you_type_spec", + "display_spec", + "session", + "session_spec", + "relevance_threshold", + "relevance_score_spec", + "ranking_expression", + "ranking_expression_backend", + ), + "search_lite": ( + "serving_config", + "branch", + "query", + "image_query", + "page_size", + "page_token", + "offset", + "one_box_page_size", + "data_store_specs", + "filter", + "canonical_filter", + "order_by", + "user_info", + "language_code", + "facet_specs", + "boost_spec", + "params", + "query_expansion_spec", + "spell_correction_spec", + "user_pseudo_id", + "content_search_spec", + "safe_search", + "user_labels", + "search_as_you_type_spec", + "display_spec", + "session", + "session_spec", + "relevance_threshold", + "relevance_score_spec", + "ranking_expression", + "ranking_expression_backend", + ), + "stream_answer_query": ( + "serving_config", + "query", + "session", + "safety_spec", + "related_questions_spec", + "grounding_spec", + "answer_generation_spec", + "search_spec", + "query_understanding_spec", + "asynchronous_mode", + "user_pseudo_id", + "user_labels", + "end_user_spec", + ), + "stream_assist": ( + "name", + "query", + "session", + "user_metadata", + "tools_spec", + "generation_spec", + ), + "stream_generate_grounded_content": ( + "location", + "system_instruction", + "contents", + "generation_spec", + "grounding_spec", + "user_labels", + ), + "train_custom_model": ( + "data_store", + "gcs_training_input", + "model_type", + "error_config", + "model_id", + ), + "update_cmek_config": ( + "config", + "set_default", + ), + "update_control": ( + "control", + "update_mask", + ), + "update_conversation": ( + "conversation", + "update_mask", + ), + "update_data_store": ( + "data_store", + "update_mask", + ), + "update_document": ( + "document", + "allow_missing", + "update_mask", + ), + "update_engine": ( + "engine", + "update_mask", + ), + "update_schema": ( + "schema", + "allow_missing", + ), + "update_serving_config": ( + "serving_config", + "update_mask", + ), + "update_session": ( + "session", + "update_mask", + ), + "update_target_site": ("target_site",), + "write_user_event": ( + "parent", + "user_event", + "write_async", + ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -148,30 +515,32 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: a.keyword.value not in self.CTRL_PARAMS, - kwargs + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs ) - args, ctrl_args = args[:len(kword_params)], args[len(kword_params):] - ctrl_kwargs.extend(cst.Arg(value=a.value, keyword=cst.Name(value=ctrl)) - for a, ctrl in zip(ctrl_args, self.CTRL_PARAMS)) + args, ctrl_args = args[: len(kword_params)], args[len(kword_params) :] + ctrl_kwargs.extend( + cst.Arg(value=a.value, keyword=cst.Name(value=ctrl)) + for a, ctrl in zip(ctrl_args, self.CTRL_PARAMS) + ) request_arg = cst.Arg( - value=cst.Dict([ - cst.DictElement( - cst.SimpleString("'{}'".format(name)), -cst.Element(value=arg.value) - ) - # Note: the args + kwargs looks silly, but keep in mind that - # the control parameters had to be stripped out, and that - # those could have been passed positionally or by keyword. - for name, arg in zip(kword_params, args + kwargs)]), - keyword=cst.Name("request") + value=cst.Dict( + [ + cst.DictElement( + cst.SimpleString("'{}'".format(name)), + cst.Element(value=arg.value), + ) + # Note: the args + kwargs looks silly, but keep in mind that + # the control parameters had to be stripped out, and that + # those could have been passed positionally or by keyword. + for name, arg in zip(kword_params, args + kwargs) + ] + ), + keyword=cst.Name("request"), ) - return updated.with_changes( - args=[request_arg] + ctrl_kwargs - ) + return updated.with_changes(args=[request_arg] + ctrl_kwargs) def fix_files( @@ -189,11 +558,12 @@ def fix_files( pyfile_gen = ( pathlib.Path(os.path.join(root, f)) for root, _, files in os.walk(in_dir) - for f in files if os.path.splitext(f)[1] == ".py" + for f in files + if os.path.splitext(f)[1] == ".py" ) for fpath in pyfile_gen: - with open(fpath, 'r') as f: + with open(fpath, "r") as f: src = f.read() # Parse the code and insert method call fixes. @@ -205,11 +575,11 @@ def fix_files( updated_path.parent.mkdir(parents=True, exist_ok=True) # Generate the updated source file at the corresponding path. - with open(updated_path, 'w') as f: + with open(updated_path, "w") as f: f.write(updated.code) -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( description="""Fix up source that uses the discoveryengine client library. @@ -224,20 +594,21 @@ def fix_files( These all constitute false negatives. The tool will also detect false positives when an API method shares a name with another method. -""") +""" + ) parser.add_argument( - '-d', - '--input-directory', + "-d", + "--input-directory", required=True, - dest='input_dir', - help='the input directory to walk for python files to fix up', + dest="input_dir", + help="the input directory to walk for python files to fix up", ) parser.add_argument( - '-o', - '--output-directory', + "-o", + "--output-directory", required=True, - dest='output_dir', - help='the directory to output files fixed via un-flattening', + dest="output_dir", + help="the directory to output files fixed via un-flattening", ) args = parser.parse_args() input_dir = pathlib.Path(args.input_dir) diff --git a/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1alpha_keywords.py b/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1alpha_keywords.py index 9a45d1dd795d..1f3866947078 100644 --- a/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1alpha_keywords.py +++ b/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1alpha_keywords.py @@ -19,12 +19,11 @@ import libcst as cst import pathlib import sys -from typing import (Any, Callable, Dict, List, Sequence, Tuple) +from typing import Any, Callable, Dict, List, Sequence, Tuple def partition( - predicate: Callable[[Any], bool], - iterator: Sequence[Any] + predicate: Callable[[Any], bool], iterator: Sequence[Any] ) -> Tuple[List[Any], List[Any]]: """A stable, out-of-place partition.""" results = ([], []) @@ -37,111 +36,440 @@ def partition( class discoveryengineCallTransformer(cst.CSTTransformer): - CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') + CTRL_PARAMS: Tuple[str] = ("retry", "timeout", "metadata") METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'answer_query': ('serving_config', 'query', 'session', 'safety_spec', 'related_questions_spec', 'answer_generation_spec', 'search_spec', 'query_understanding_spec', 'asynchronous_mode', 'user_pseudo_id', 'user_labels', ), - 'batch_create_target_sites': ('parent', 'requests', ), - 'batch_get_documents_metadata': ('parent', 'matcher', ), - 'batch_verify_target_sites': ('parent', ), - 'check_grounding': ('grounding_config', 'answer_candidate', 'facts', 'grounding_spec', 'user_labels', ), - 'collect_user_event': ('parent', 'user_event', 'uri', 'ets', ), - 'complete_query': ('data_store', 'query', 'query_model', 'user_pseudo_id', 'include_tail_suggestions', ), - 'converse_conversation': ('name', 'query', 'serving_config', 'conversation', 'safe_search', 'user_labels', 'summary_spec', 'filter', 'boost_spec', ), - 'create_control': ('parent', 'control', 'control_id', ), - 'create_conversation': ('parent', 'conversation', ), - 'create_data_store': ('parent', 'data_store', 'data_store_id', 'create_advanced_site_search', 'skip_default_schema_creation', ), - 'create_document': ('parent', 'document', 'document_id', ), - 'create_engine': ('parent', 'engine', 'engine_id', ), - 'create_evaluation': ('parent', 'evaluation', ), - 'create_sample_query': ('parent', 'sample_query', 'sample_query_id', ), - 'create_sample_query_set': ('parent', 'sample_query_set', 'sample_query_set_id', ), - 'create_schema': ('parent', 'schema', 'schema_id', ), - 'create_session': ('parent', 'session', ), - 'create_target_site': ('parent', 'target_site', ), - 'delete_control': ('name', ), - 'delete_conversation': ('name', ), - 'delete_data_store': ('name', ), - 'delete_document': ('name', ), - 'delete_engine': ('name', ), - 'delete_sample_query': ('name', ), - 'delete_sample_query_set': ('name', ), - 'delete_schema': ('name', ), - 'delete_session': ('name', ), - 'delete_target_site': ('name', ), - 'disable_advanced_site_search': ('site_search_engine', ), - 'enable_advanced_site_search': ('site_search_engine', ), - 'estimate_data_size': ('location', 'website_data_source', 'file_data_source', ), - 'fetch_domain_verification_status': ('site_search_engine', 'page_size', 'page_token', ), - 'get_acl_config': ('name', ), - 'get_answer': ('name', ), - 'get_chunk': ('name', ), - 'get_control': ('name', ), - 'get_conversation': ('name', ), - 'get_data_store': ('name', ), - 'get_document': ('name', ), - 'get_document_processing_config': ('name', ), - 'get_engine': ('name', ), - 'get_evaluation': ('name', ), - 'get_processed_document': ('name', 'processed_document_type', 'processed_document_format', ), - 'get_project': ('name', ), - 'get_sample_query': ('name', ), - 'get_sample_query_set': ('name', ), - 'get_schema': ('name', ), - 'get_serving_config': ('name', ), - 'get_session': ('name', 'include_answer_details', ), - 'get_site_search_engine': ('name', ), - 'get_target_site': ('name', ), - 'get_uri_pattern_document_data': ('site_search_engine', ), - 'import_completion_suggestions': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'error_config', ), - 'import_documents': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'fhir_store_source', 'spanner_source', 'cloud_sql_source', 'firestore_source', 'alloy_db_source', 'bigtable_source', 'error_config', 'reconciliation_mode', 'update_mask', 'auto_generate_ids', 'id_field', ), - 'import_sample_queries': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'error_config', ), - 'import_suggestion_deny_list_entries': ('parent', 'inline_source', 'gcs_source', ), - 'import_user_events': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'error_config', ), - 'list_chunks': ('parent', 'page_size', 'page_token', ), - 'list_controls': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_conversations': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_custom_models': ('data_store', ), - 'list_data_stores': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_documents': ('parent', 'page_size', 'page_token', ), - 'list_engines': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_evaluation_results': ('evaluation', 'page_size', 'page_token', ), - 'list_evaluations': ('parent', 'page_size', 'page_token', ), - 'list_files': ('parent', 'filter', 'page_size', 'page_token', ), - 'list_sample_queries': ('parent', 'page_size', 'page_token', ), - 'list_sample_query_sets': ('parent', 'page_size', 'page_token', ), - 'list_schemas': ('parent', 'page_size', 'page_token', ), - 'list_serving_configs': ('parent', 'page_size', 'page_token', ), - 'list_sessions': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_target_sites': ('parent', 'page_size', 'page_token', ), - 'pause_engine': ('name', ), - 'provision_project': ('name', 'accept_data_use_terms', 'data_use_terms_version', ), - 'purge_completion_suggestions': ('parent', ), - 'purge_documents': ('parent', 'filter', 'gcs_source', 'inline_source', 'error_config', 'force', ), - 'purge_suggestion_deny_list_entries': ('parent', ), - 'purge_user_events': ('parent', 'filter', 'force', ), - 'rank': ('ranking_config', 'records', 'model', 'top_n', 'query', 'ignore_record_details_in_response', 'user_labels', ), - 'recommend': ('serving_config', 'user_event', 'page_size', 'filter', 'validate_only', 'params', 'user_labels', ), - 'recrawl_uris': ('site_search_engine', 'uris', ), - 'report_consent_change': ('consent_change_action', 'project', 'service_term_id', 'service_term_version', ), - 'resume_engine': ('name', ), - 'search': ('serving_config', 'branch', 'query', 'image_query', 'page_size', 'page_token', 'offset', 'data_store_specs', 'filter', 'canonical_filter', 'order_by', 'user_info', 'language_code', 'region_code', 'facet_specs', 'boost_spec', 'params', 'query_expansion_spec', 'spell_correction_spec', 'user_pseudo_id', 'content_search_spec', 'embedding_spec', 'ranking_expression', 'ranking_expression_backend', 'safe_search', 'user_labels', 'natural_language_query_understanding_spec', 'search_as_you_type_spec', 'custom_fine_tuning_spec', 'session', 'session_spec', 'relevance_threshold', ), - 'set_uri_pattern_document_data': ('site_search_engine', 'document_data_map', 'empty_document_data_map', 'schema', ), - 'train_custom_model': ('data_store', 'gcs_training_input', 'model_type', 'error_config', 'model_id', ), - 'tune_engine': ('name', ), - 'update_acl_config': ('acl_config', ), - 'update_control': ('control', 'update_mask', ), - 'update_conversation': ('conversation', 'update_mask', ), - 'update_data_store': ('data_store', 'update_mask', ), - 'update_document': ('document', 'allow_missing', 'update_mask', ), - 'update_document_processing_config': ('document_processing_config', 'update_mask', ), - 'update_engine': ('engine', 'update_mask', ), - 'update_sample_query': ('sample_query', 'update_mask', ), - 'update_sample_query_set': ('sample_query_set', 'update_mask', ), - 'update_schema': ('schema', 'allow_missing', ), - 'update_serving_config': ('serving_config', 'update_mask', ), - 'update_session': ('session', 'update_mask', ), - 'update_target_site': ('target_site', ), - 'write_user_event': ('parent', 'user_event', 'write_async', ), + "answer_query": ( + "serving_config", + "query", + "session", + "safety_spec", + "related_questions_spec", + "answer_generation_spec", + "search_spec", + "query_understanding_spec", + "asynchronous_mode", + "user_pseudo_id", + "user_labels", + ), + "batch_create_target_sites": ( + "parent", + "requests", + ), + "batch_get_documents_metadata": ( + "parent", + "matcher", + ), + "batch_verify_target_sites": ("parent",), + "check_grounding": ( + "grounding_config", + "answer_candidate", + "facts", + "grounding_spec", + "user_labels", + ), + "collect_user_event": ( + "parent", + "user_event", + "uri", + "ets", + ), + "complete_query": ( + "data_store", + "query", + "query_model", + "user_pseudo_id", + "include_tail_suggestions", + ), + "converse_conversation": ( + "name", + "query", + "serving_config", + "conversation", + "safe_search", + "user_labels", + "summary_spec", + "filter", + "boost_spec", + ), + "create_control": ( + "parent", + "control", + "control_id", + ), + "create_conversation": ( + "parent", + "conversation", + ), + "create_data_store": ( + "parent", + "data_store", + "data_store_id", + "create_advanced_site_search", + "skip_default_schema_creation", + ), + "create_document": ( + "parent", + "document", + "document_id", + ), + "create_engine": ( + "parent", + "engine", + "engine_id", + ), + "create_evaluation": ( + "parent", + "evaluation", + ), + "create_sample_query": ( + "parent", + "sample_query", + "sample_query_id", + ), + "create_sample_query_set": ( + "parent", + "sample_query_set", + "sample_query_set_id", + ), + "create_schema": ( + "parent", + "schema", + "schema_id", + ), + "create_session": ( + "parent", + "session", + ), + "create_target_site": ( + "parent", + "target_site", + ), + "delete_control": ("name",), + "delete_conversation": ("name",), + "delete_data_store": ("name",), + "delete_document": ("name",), + "delete_engine": ("name",), + "delete_sample_query": ("name",), + "delete_sample_query_set": ("name",), + "delete_schema": ("name",), + "delete_session": ("name",), + "delete_target_site": ("name",), + "disable_advanced_site_search": ("site_search_engine",), + "enable_advanced_site_search": ("site_search_engine",), + "estimate_data_size": ( + "location", + "website_data_source", + "file_data_source", + ), + "fetch_domain_verification_status": ( + "site_search_engine", + "page_size", + "page_token", + ), + "get_acl_config": ("name",), + "get_answer": ("name",), + "get_chunk": ("name",), + "get_control": ("name",), + "get_conversation": ("name",), + "get_data_store": ("name",), + "get_document": ("name",), + "get_document_processing_config": ("name",), + "get_engine": ("name",), + "get_evaluation": ("name",), + "get_processed_document": ( + "name", + "processed_document_type", + "processed_document_format", + ), + "get_project": ("name",), + "get_sample_query": ("name",), + "get_sample_query_set": ("name",), + "get_schema": ("name",), + "get_serving_config": ("name",), + "get_session": ( + "name", + "include_answer_details", + ), + "get_site_search_engine": ("name",), + "get_target_site": ("name",), + "get_uri_pattern_document_data": ("site_search_engine",), + "import_completion_suggestions": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "error_config", + ), + "import_documents": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "fhir_store_source", + "spanner_source", + "cloud_sql_source", + "firestore_source", + "alloy_db_source", + "bigtable_source", + "error_config", + "reconciliation_mode", + "update_mask", + "auto_generate_ids", + "id_field", + ), + "import_sample_queries": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "error_config", + ), + "import_suggestion_deny_list_entries": ( + "parent", + "inline_source", + "gcs_source", + ), + "import_user_events": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "error_config", + ), + "list_chunks": ( + "parent", + "page_size", + "page_token", + ), + "list_controls": ( + "parent", + "page_size", + "page_token", + "filter", + ), + "list_conversations": ( + "parent", + "page_size", + "page_token", + "filter", + "order_by", + ), + "list_custom_models": ("data_store",), + "list_data_stores": ( + "parent", + "page_size", + "page_token", + "filter", + ), + "list_documents": ( + "parent", + "page_size", + "page_token", + ), + "list_engines": ( + "parent", + "page_size", + "page_token", + "filter", + ), + "list_evaluation_results": ( + "evaluation", + "page_size", + "page_token", + ), + "list_evaluations": ( + "parent", + "page_size", + "page_token", + ), + "list_files": ( + "parent", + "filter", + "page_size", + "page_token", + ), + "list_sample_queries": ( + "parent", + "page_size", + "page_token", + ), + "list_sample_query_sets": ( + "parent", + "page_size", + "page_token", + ), + "list_schemas": ( + "parent", + "page_size", + "page_token", + ), + "list_serving_configs": ( + "parent", + "page_size", + "page_token", + ), + "list_sessions": ( + "parent", + "page_size", + "page_token", + "filter", + "order_by", + ), + "list_target_sites": ( + "parent", + "page_size", + "page_token", + ), + "pause_engine": ("name",), + "provision_project": ( + "name", + "accept_data_use_terms", + "data_use_terms_version", + ), + "purge_completion_suggestions": ("parent",), + "purge_documents": ( + "parent", + "filter", + "gcs_source", + "inline_source", + "error_config", + "force", + ), + "purge_suggestion_deny_list_entries": ("parent",), + "purge_user_events": ( + "parent", + "filter", + "force", + ), + "rank": ( + "ranking_config", + "records", + "model", + "top_n", + "query", + "ignore_record_details_in_response", + "user_labels", + ), + "recommend": ( + "serving_config", + "user_event", + "page_size", + "filter", + "validate_only", + "params", + "user_labels", + ), + "recrawl_uris": ( + "site_search_engine", + "uris", + ), + "report_consent_change": ( + "consent_change_action", + "project", + "service_term_id", + "service_term_version", + ), + "resume_engine": ("name",), + "search": ( + "serving_config", + "branch", + "query", + "image_query", + "page_size", + "page_token", + "offset", + "data_store_specs", + "filter", + "canonical_filter", + "order_by", + "user_info", + "language_code", + "region_code", + "facet_specs", + "boost_spec", + "params", + "query_expansion_spec", + "spell_correction_spec", + "user_pseudo_id", + "content_search_spec", + "embedding_spec", + "ranking_expression", + "ranking_expression_backend", + "safe_search", + "user_labels", + "natural_language_query_understanding_spec", + "search_as_you_type_spec", + "custom_fine_tuning_spec", + "session", + "session_spec", + "relevance_threshold", + ), + "set_uri_pattern_document_data": ( + "site_search_engine", + "document_data_map", + "empty_document_data_map", + "schema", + ), + "train_custom_model": ( + "data_store", + "gcs_training_input", + "model_type", + "error_config", + "model_id", + ), + "tune_engine": ("name",), + "update_acl_config": ("acl_config",), + "update_control": ( + "control", + "update_mask", + ), + "update_conversation": ( + "conversation", + "update_mask", + ), + "update_data_store": ( + "data_store", + "update_mask", + ), + "update_document": ( + "document", + "allow_missing", + "update_mask", + ), + "update_document_processing_config": ( + "document_processing_config", + "update_mask", + ), + "update_engine": ( + "engine", + "update_mask", + ), + "update_sample_query": ( + "sample_query", + "update_mask", + ), + "update_sample_query_set": ( + "sample_query_set", + "update_mask", + ), + "update_schema": ( + "schema", + "allow_missing", + ), + "update_serving_config": ( + "serving_config", + "update_mask", + ), + "update_session": ( + "session", + "update_mask", + ), + "update_target_site": ("target_site",), + "write_user_event": ( + "parent", + "user_event", + "write_async", + ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -160,30 +488,32 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: a.keyword.value not in self.CTRL_PARAMS, - kwargs + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs ) - args, ctrl_args = args[:len(kword_params)], args[len(kword_params):] - ctrl_kwargs.extend(cst.Arg(value=a.value, keyword=cst.Name(value=ctrl)) - for a, ctrl in zip(ctrl_args, self.CTRL_PARAMS)) + args, ctrl_args = args[: len(kword_params)], args[len(kword_params) :] + ctrl_kwargs.extend( + cst.Arg(value=a.value, keyword=cst.Name(value=ctrl)) + for a, ctrl in zip(ctrl_args, self.CTRL_PARAMS) + ) request_arg = cst.Arg( - value=cst.Dict([ - cst.DictElement( - cst.SimpleString("'{}'".format(name)), -cst.Element(value=arg.value) - ) - # Note: the args + kwargs looks silly, but keep in mind that - # the control parameters had to be stripped out, and that - # those could have been passed positionally or by keyword. - for name, arg in zip(kword_params, args + kwargs)]), - keyword=cst.Name("request") + value=cst.Dict( + [ + cst.DictElement( + cst.SimpleString("'{}'".format(name)), + cst.Element(value=arg.value), + ) + # Note: the args + kwargs looks silly, but keep in mind that + # the control parameters had to be stripped out, and that + # those could have been passed positionally or by keyword. + for name, arg in zip(kword_params, args + kwargs) + ] + ), + keyword=cst.Name("request"), ) - return updated.with_changes( - args=[request_arg] + ctrl_kwargs - ) + return updated.with_changes(args=[request_arg] + ctrl_kwargs) def fix_files( @@ -201,11 +531,12 @@ def fix_files( pyfile_gen = ( pathlib.Path(os.path.join(root, f)) for root, _, files in os.walk(in_dir) - for f in files if os.path.splitext(f)[1] == ".py" + for f in files + if os.path.splitext(f)[1] == ".py" ) for fpath in pyfile_gen: - with open(fpath, 'r') as f: + with open(fpath, "r") as f: src = f.read() # Parse the code and insert method call fixes. @@ -217,11 +548,11 @@ def fix_files( updated_path.parent.mkdir(parents=True, exist_ok=True) # Generate the updated source file at the corresponding path. - with open(updated_path, 'w') as f: + with open(updated_path, "w") as f: f.write(updated.code) -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( description="""Fix up source that uses the discoveryengine client library. @@ -236,20 +567,21 @@ def fix_files( These all constitute false negatives. The tool will also detect false positives when an API method shares a name with another method. -""") +""" + ) parser.add_argument( - '-d', - '--input-directory', + "-d", + "--input-directory", required=True, - dest='input_dir', - help='the input directory to walk for python files to fix up', + dest="input_dir", + help="the input directory to walk for python files to fix up", ) parser.add_argument( - '-o', - '--output-directory', + "-o", + "--output-directory", required=True, - dest='output_dir', - help='the directory to output files fixed via un-flattening', + dest="output_dir", + help="the directory to output files fixed via un-flattening", ) args = parser.parse_args() input_dir = pathlib.Path(args.input_dir) diff --git a/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1beta_keywords.py b/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1beta_keywords.py index 8c188b9bafdc..a6f48d6e282b 100644 --- a/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1beta_keywords.py +++ b/packages/google-cloud-discoveryengine/scripts/fixup_discoveryengine_v1beta_keywords.py @@ -19,12 +19,11 @@ import libcst as cst import pathlib import sys -from typing import (Any, Callable, Dict, List, Sequence, Tuple) +from typing import Any, Callable, Dict, List, Sequence, Tuple def partition( - predicate: Callable[[Any], bool], - iterator: Sequence[Any] + predicate: Callable[[Any], bool], iterator: Sequence[Any] ) -> Tuple[List[Any], List[Any]]: """A stable, out-of-place partition.""" results = ([], []) @@ -37,105 +36,470 @@ def partition( class discoveryengineCallTransformer(cst.CSTTransformer): - CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') + CTRL_PARAMS: Tuple[str] = ("retry", "timeout", "metadata") METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'advanced_complete_query': ('completion_config', 'query', 'query_model', 'user_pseudo_id', 'user_info', 'include_tail_suggestions', 'boost_spec', 'suggestion_types', ), - 'answer_query': ('serving_config', 'query', 'session', 'safety_spec', 'related_questions_spec', 'grounding_spec', 'answer_generation_spec', 'search_spec', 'query_understanding_spec', 'asynchronous_mode', 'user_pseudo_id', 'user_labels', ), - 'batch_create_target_sites': ('parent', 'requests', ), - 'batch_get_documents_metadata': ('parent', 'matcher', ), - 'batch_verify_target_sites': ('parent', ), - 'check_grounding': ('grounding_config', 'answer_candidate', 'facts', 'grounding_spec', 'user_labels', ), - 'collect_user_event': ('parent', 'user_event', 'uri', 'ets', ), - 'complete_query': ('data_store', 'query', 'query_model', 'user_pseudo_id', 'include_tail_suggestions', ), - 'converse_conversation': ('name', 'query', 'serving_config', 'conversation', 'safe_search', 'user_labels', 'summary_spec', 'filter', 'boost_spec', ), - 'create_control': ('parent', 'control', 'control_id', ), - 'create_conversation': ('parent', 'conversation', ), - 'create_data_store': ('parent', 'data_store', 'data_store_id', 'create_advanced_site_search', 'skip_default_schema_creation', ), - 'create_document': ('parent', 'document', 'document_id', ), - 'create_engine': ('parent', 'engine', 'engine_id', ), - 'create_evaluation': ('parent', 'evaluation', ), - 'create_sample_query': ('parent', 'sample_query', 'sample_query_id', ), - 'create_sample_query_set': ('parent', 'sample_query_set', 'sample_query_set_id', ), - 'create_schema': ('parent', 'schema', 'schema_id', ), - 'create_session': ('parent', 'session', ), - 'create_sitemap': ('parent', 'sitemap', ), - 'create_target_site': ('parent', 'target_site', ), - 'delete_control': ('name', ), - 'delete_conversation': ('name', ), - 'delete_data_store': ('name', ), - 'delete_document': ('name', ), - 'delete_engine': ('name', ), - 'delete_sample_query': ('name', ), - 'delete_sample_query_set': ('name', ), - 'delete_schema': ('name', ), - 'delete_session': ('name', ), - 'delete_sitemap': ('name', ), - 'delete_target_site': ('name', ), - 'disable_advanced_site_search': ('site_search_engine', ), - 'enable_advanced_site_search': ('site_search_engine', ), - 'fetch_domain_verification_status': ('site_search_engine', 'page_size', 'page_token', ), - 'fetch_sitemaps': ('parent', 'matcher', ), - 'generate_grounded_content': ('location', 'system_instruction', 'contents', 'generation_spec', 'grounding_spec', 'user_labels', ), - 'get_answer': ('name', ), - 'get_control': ('name', ), - 'get_conversation': ('name', ), - 'get_data_store': ('name', ), - 'get_document': ('name', ), - 'get_engine': ('name', ), - 'get_evaluation': ('name', ), - 'get_sample_query': ('name', ), - 'get_sample_query_set': ('name', ), - 'get_schema': ('name', ), - 'get_serving_config': ('name', ), - 'get_session': ('name', 'include_answer_details', ), - 'get_site_search_engine': ('name', ), - 'get_target_site': ('name', ), - 'import_completion_suggestions': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'error_config', ), - 'import_documents': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'fhir_store_source', 'spanner_source', 'cloud_sql_source', 'firestore_source', 'alloy_db_source', 'bigtable_source', 'error_config', 'reconciliation_mode', 'update_mask', 'auto_generate_ids', 'id_field', ), - 'import_sample_queries': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'error_config', ), - 'import_suggestion_deny_list_entries': ('parent', 'inline_source', 'gcs_source', ), - 'import_user_events': ('parent', 'inline_source', 'gcs_source', 'bigquery_source', 'error_config', ), - 'list_controls': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_conversations': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_custom_models': ('data_store', ), - 'list_data_stores': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_documents': ('parent', 'page_size', 'page_token', ), - 'list_engines': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_evaluation_results': ('evaluation', 'page_size', 'page_token', ), - 'list_evaluations': ('parent', 'page_size', 'page_token', ), - 'list_sample_queries': ('parent', 'page_size', 'page_token', ), - 'list_sample_query_sets': ('parent', 'page_size', 'page_token', ), - 'list_schemas': ('parent', 'page_size', 'page_token', ), - 'list_serving_configs': ('parent', 'page_size', 'page_token', ), - 'list_sessions': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_target_sites': ('parent', 'page_size', 'page_token', ), - 'pause_engine': ('name', ), - 'provision_project': ('name', 'accept_data_use_terms', 'data_use_terms_version', ), - 'purge_completion_suggestions': ('parent', ), - 'purge_documents': ('parent', 'filter', 'gcs_source', 'inline_source', 'error_config', 'force', ), - 'purge_suggestion_deny_list_entries': ('parent', ), - 'purge_user_events': ('parent', 'filter', 'force', ), - 'rank': ('ranking_config', 'records', 'model', 'top_n', 'query', 'ignore_record_details_in_response', 'user_labels', ), - 'recommend': ('serving_config', 'user_event', 'page_size', 'filter', 'validate_only', 'params', 'user_labels', ), - 'recrawl_uris': ('site_search_engine', 'uris', 'site_credential', ), - 'resume_engine': ('name', ), - 'search': ('serving_config', 'branch', 'query', 'image_query', 'page_size', 'page_token', 'offset', 'one_box_page_size', 'data_store_specs', 'filter', 'canonical_filter', 'order_by', 'user_info', 'language_code', 'region_code', 'facet_specs', 'boost_spec', 'params', 'query_expansion_spec', 'spell_correction_spec', 'user_pseudo_id', 'content_search_spec', 'embedding_spec', 'ranking_expression', 'ranking_expression_backend', 'safe_search', 'user_labels', 'natural_language_query_understanding_spec', 'search_as_you_type_spec', 'session', 'session_spec', 'relevance_threshold', 'personalization_spec', ), - 'search_lite': ('serving_config', 'branch', 'query', 'image_query', 'page_size', 'page_token', 'offset', 'one_box_page_size', 'data_store_specs', 'filter', 'canonical_filter', 'order_by', 'user_info', 'language_code', 'region_code', 'facet_specs', 'boost_spec', 'params', 'query_expansion_spec', 'spell_correction_spec', 'user_pseudo_id', 'content_search_spec', 'embedding_spec', 'ranking_expression', 'ranking_expression_backend', 'safe_search', 'user_labels', 'natural_language_query_understanding_spec', 'search_as_you_type_spec', 'session', 'session_spec', 'relevance_threshold', 'personalization_spec', ), - 'stream_generate_grounded_content': ('location', 'system_instruction', 'contents', 'generation_spec', 'grounding_spec', 'user_labels', ), - 'train_custom_model': ('data_store', 'gcs_training_input', 'model_type', 'error_config', 'model_id', ), - 'tune_engine': ('name', ), - 'update_control': ('control', 'update_mask', ), - 'update_conversation': ('conversation', 'update_mask', ), - 'update_data_store': ('data_store', 'update_mask', ), - 'update_document': ('document', 'allow_missing', 'update_mask', ), - 'update_engine': ('engine', 'update_mask', ), - 'update_sample_query': ('sample_query', 'update_mask', ), - 'update_sample_query_set': ('sample_query_set', 'update_mask', ), - 'update_schema': ('schema', 'allow_missing', ), - 'update_serving_config': ('serving_config', 'update_mask', ), - 'update_session': ('session', 'update_mask', ), - 'update_target_site': ('target_site', ), - 'write_user_event': ('parent', 'user_event', 'write_async', ), + "advanced_complete_query": ( + "completion_config", + "query", + "query_model", + "user_pseudo_id", + "user_info", + "include_tail_suggestions", + "boost_spec", + "suggestion_types", + ), + "answer_query": ( + "serving_config", + "query", + "session", + "safety_spec", + "related_questions_spec", + "grounding_spec", + "answer_generation_spec", + "search_spec", + "query_understanding_spec", + "asynchronous_mode", + "user_pseudo_id", + "user_labels", + ), + "batch_create_target_sites": ( + "parent", + "requests", + ), + "batch_get_documents_metadata": ( + "parent", + "matcher", + ), + "batch_verify_target_sites": ("parent",), + "check_grounding": ( + "grounding_config", + "answer_candidate", + "facts", + "grounding_spec", + "user_labels", + ), + "collect_user_event": ( + "parent", + "user_event", + "uri", + "ets", + ), + "complete_query": ( + "data_store", + "query", + "query_model", + "user_pseudo_id", + "include_tail_suggestions", + ), + "converse_conversation": ( + "name", + "query", + "serving_config", + "conversation", + "safe_search", + "user_labels", + "summary_spec", + "filter", + "boost_spec", + ), + "create_control": ( + "parent", + "control", + "control_id", + ), + "create_conversation": ( + "parent", + "conversation", + ), + "create_data_store": ( + "parent", + "data_store", + "data_store_id", + "create_advanced_site_search", + "skip_default_schema_creation", + ), + "create_document": ( + "parent", + "document", + "document_id", + ), + "create_engine": ( + "parent", + "engine", + "engine_id", + ), + "create_evaluation": ( + "parent", + "evaluation", + ), + "create_sample_query": ( + "parent", + "sample_query", + "sample_query_id", + ), + "create_sample_query_set": ( + "parent", + "sample_query_set", + "sample_query_set_id", + ), + "create_schema": ( + "parent", + "schema", + "schema_id", + ), + "create_session": ( + "parent", + "session", + ), + "create_sitemap": ( + "parent", + "sitemap", + ), + "create_target_site": ( + "parent", + "target_site", + ), + "delete_control": ("name",), + "delete_conversation": ("name",), + "delete_data_store": ("name",), + "delete_document": ("name",), + "delete_engine": ("name",), + "delete_sample_query": ("name",), + "delete_sample_query_set": ("name",), + "delete_schema": ("name",), + "delete_session": ("name",), + "delete_sitemap": ("name",), + "delete_target_site": ("name",), + "disable_advanced_site_search": ("site_search_engine",), + "enable_advanced_site_search": ("site_search_engine",), + "fetch_domain_verification_status": ( + "site_search_engine", + "page_size", + "page_token", + ), + "fetch_sitemaps": ( + "parent", + "matcher", + ), + "generate_grounded_content": ( + "location", + "system_instruction", + "contents", + "generation_spec", + "grounding_spec", + "user_labels", + ), + "get_answer": ("name",), + "get_control": ("name",), + "get_conversation": ("name",), + "get_data_store": ("name",), + "get_document": ("name",), + "get_engine": ("name",), + "get_evaluation": ("name",), + "get_sample_query": ("name",), + "get_sample_query_set": ("name",), + "get_schema": ("name",), + "get_serving_config": ("name",), + "get_session": ( + "name", + "include_answer_details", + ), + "get_site_search_engine": ("name",), + "get_target_site": ("name",), + "import_completion_suggestions": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "error_config", + ), + "import_documents": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "fhir_store_source", + "spanner_source", + "cloud_sql_source", + "firestore_source", + "alloy_db_source", + "bigtable_source", + "error_config", + "reconciliation_mode", + "update_mask", + "auto_generate_ids", + "id_field", + ), + "import_sample_queries": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "error_config", + ), + "import_suggestion_deny_list_entries": ( + "parent", + "inline_source", + "gcs_source", + ), + "import_user_events": ( + "parent", + "inline_source", + "gcs_source", + "bigquery_source", + "error_config", + ), + "list_controls": ( + "parent", + "page_size", + "page_token", + "filter", + ), + "list_conversations": ( + "parent", + "page_size", + "page_token", + "filter", + "order_by", + ), + "list_custom_models": ("data_store",), + "list_data_stores": ( + "parent", + "page_size", + "page_token", + "filter", + ), + "list_documents": ( + "parent", + "page_size", + "page_token", + ), + "list_engines": ( + "parent", + "page_size", + "page_token", + "filter", + ), + "list_evaluation_results": ( + "evaluation", + "page_size", + "page_token", + ), + "list_evaluations": ( + "parent", + "page_size", + "page_token", + ), + "list_sample_queries": ( + "parent", + "page_size", + "page_token", + ), + "list_sample_query_sets": ( + "parent", + "page_size", + "page_token", + ), + "list_schemas": ( + "parent", + "page_size", + "page_token", + ), + "list_serving_configs": ( + "parent", + "page_size", + "page_token", + ), + "list_sessions": ( + "parent", + "page_size", + "page_token", + "filter", + "order_by", + ), + "list_target_sites": ( + "parent", + "page_size", + "page_token", + ), + "pause_engine": ("name",), + "provision_project": ( + "name", + "accept_data_use_terms", + "data_use_terms_version", + ), + "purge_completion_suggestions": ("parent",), + "purge_documents": ( + "parent", + "filter", + "gcs_source", + "inline_source", + "error_config", + "force", + ), + "purge_suggestion_deny_list_entries": ("parent",), + "purge_user_events": ( + "parent", + "filter", + "force", + ), + "rank": ( + "ranking_config", + "records", + "model", + "top_n", + "query", + "ignore_record_details_in_response", + "user_labels", + ), + "recommend": ( + "serving_config", + "user_event", + "page_size", + "filter", + "validate_only", + "params", + "user_labels", + ), + "recrawl_uris": ( + "site_search_engine", + "uris", + "site_credential", + ), + "resume_engine": ("name",), + "search": ( + "serving_config", + "branch", + "query", + "image_query", + "page_size", + "page_token", + "offset", + "one_box_page_size", + "data_store_specs", + "filter", + "canonical_filter", + "order_by", + "user_info", + "language_code", + "region_code", + "facet_specs", + "boost_spec", + "params", + "query_expansion_spec", + "spell_correction_spec", + "user_pseudo_id", + "content_search_spec", + "embedding_spec", + "ranking_expression", + "ranking_expression_backend", + "safe_search", + "user_labels", + "natural_language_query_understanding_spec", + "search_as_you_type_spec", + "session", + "session_spec", + "relevance_threshold", + "personalization_spec", + ), + "search_lite": ( + "serving_config", + "branch", + "query", + "image_query", + "page_size", + "page_token", + "offset", + "one_box_page_size", + "data_store_specs", + "filter", + "canonical_filter", + "order_by", + "user_info", + "language_code", + "region_code", + "facet_specs", + "boost_spec", + "params", + "query_expansion_spec", + "spell_correction_spec", + "user_pseudo_id", + "content_search_spec", + "embedding_spec", + "ranking_expression", + "ranking_expression_backend", + "safe_search", + "user_labels", + "natural_language_query_understanding_spec", + "search_as_you_type_spec", + "session", + "session_spec", + "relevance_threshold", + "personalization_spec", + ), + "stream_generate_grounded_content": ( + "location", + "system_instruction", + "contents", + "generation_spec", + "grounding_spec", + "user_labels", + ), + "train_custom_model": ( + "data_store", + "gcs_training_input", + "model_type", + "error_config", + "model_id", + ), + "tune_engine": ("name",), + "update_control": ( + "control", + "update_mask", + ), + "update_conversation": ( + "conversation", + "update_mask", + ), + "update_data_store": ( + "data_store", + "update_mask", + ), + "update_document": ( + "document", + "allow_missing", + "update_mask", + ), + "update_engine": ( + "engine", + "update_mask", + ), + "update_sample_query": ( + "sample_query", + "update_mask", + ), + "update_sample_query_set": ( + "sample_query_set", + "update_mask", + ), + "update_schema": ( + "schema", + "allow_missing", + ), + "update_serving_config": ( + "serving_config", + "update_mask", + ), + "update_session": ( + "session", + "update_mask", + ), + "update_target_site": ("target_site",), + "write_user_event": ( + "parent", + "user_event", + "write_async", + ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -154,30 +518,32 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: a.keyword.value not in self.CTRL_PARAMS, - kwargs + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs ) - args, ctrl_args = args[:len(kword_params)], args[len(kword_params):] - ctrl_kwargs.extend(cst.Arg(value=a.value, keyword=cst.Name(value=ctrl)) - for a, ctrl in zip(ctrl_args, self.CTRL_PARAMS)) + args, ctrl_args = args[: len(kword_params)], args[len(kword_params) :] + ctrl_kwargs.extend( + cst.Arg(value=a.value, keyword=cst.Name(value=ctrl)) + for a, ctrl in zip(ctrl_args, self.CTRL_PARAMS) + ) request_arg = cst.Arg( - value=cst.Dict([ - cst.DictElement( - cst.SimpleString("'{}'".format(name)), -cst.Element(value=arg.value) - ) - # Note: the args + kwargs looks silly, but keep in mind that - # the control parameters had to be stripped out, and that - # those could have been passed positionally or by keyword. - for name, arg in zip(kword_params, args + kwargs)]), - keyword=cst.Name("request") + value=cst.Dict( + [ + cst.DictElement( + cst.SimpleString("'{}'".format(name)), + cst.Element(value=arg.value), + ) + # Note: the args + kwargs looks silly, but keep in mind that + # the control parameters had to be stripped out, and that + # those could have been passed positionally or by keyword. + for name, arg in zip(kword_params, args + kwargs) + ] + ), + keyword=cst.Name("request"), ) - return updated.with_changes( - args=[request_arg] + ctrl_kwargs - ) + return updated.with_changes(args=[request_arg] + ctrl_kwargs) def fix_files( @@ -195,11 +561,12 @@ def fix_files( pyfile_gen = ( pathlib.Path(os.path.join(root, f)) for root, _, files in os.walk(in_dir) - for f in files if os.path.splitext(f)[1] == ".py" + for f in files + if os.path.splitext(f)[1] == ".py" ) for fpath in pyfile_gen: - with open(fpath, 'r') as f: + with open(fpath, "r") as f: src = f.read() # Parse the code and insert method call fixes. @@ -211,11 +578,11 @@ def fix_files( updated_path.parent.mkdir(parents=True, exist_ok=True) # Generate the updated source file at the corresponding path. - with open(updated_path, 'w') as f: + with open(updated_path, "w") as f: f.write(updated.code) -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( description="""Fix up source that uses the discoveryengine client library. @@ -230,20 +597,21 @@ def fix_files( These all constitute false negatives. The tool will also detect false positives when an API method shares a name with another method. -""") +""" + ) parser.add_argument( - '-d', - '--input-directory', + "-d", + "--input-directory", required=True, - dest='input_dir', - help='the input directory to walk for python files to fix up', + dest="input_dir", + help="the input directory to walk for python files to fix up", ) parser.add_argument( - '-o', - '--output-directory', + "-o", + "--output-directory", required=True, - dest='output_dir', - help='the directory to output files fixed via un-flattening', + dest="output_dir", + help="the directory to output files fixed via un-flattening", ) args = parser.parse_args() input_dir = pathlib.Path(args.input_dir) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py index 2d5b456b0c9b..f7a78cc208a8 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_assistant_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,28 +44,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1.services.assistant_service import ( AssistantServiceAsyncClient, - AssistantServiceClient, - transports, ) -from google.cloud.discoveryengine_v1.types import ( - assist_answer, - assistant_service, - search_service, - session, +from google.cloud.discoveryengine_v1.services.assistant_service import ( + AssistantServiceClient, ) +from google.cloud.discoveryengine_v1.services.assistant_service import transports +from google.cloud.discoveryengine_v1.types import assist_answer +from google.cloud.discoveryengine_v1.types import assistant_service +from google.cloud.discoveryengine_v1.types import search_service +from google.cloud.discoveryengine_v1.types import session +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -855,10 +859,9 @@ def test_assistant_service_client_get_mtls_endpoint_and_cert_source(client_class "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1118,13 +1121,13 @@ def test_assistant_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1698,8 +1701,9 @@ def test_stream_assist_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1768,17 +1772,20 @@ def test_stream_assist_rest_interceptors(null_interceptor): ) client = AssistantServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.AssistantServiceRestInterceptor, "post_stream_assist" - ) as post, mock.patch.object( - transports.AssistantServiceRestInterceptor, "post_stream_assist_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AssistantServiceRestInterceptor, "pre_stream_assist" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AssistantServiceRestInterceptor, "post_stream_assist" + ) as post, + mock.patch.object( + transports.AssistantServiceRestInterceptor, + "post_stream_assist_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AssistantServiceRestInterceptor, "pre_stream_assist" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1838,8 +1845,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1900,8 +1908,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1960,8 +1969,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2092,11 +2102,14 @@ def test_assistant_service_base_transport(): def test_assistant_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.assistant_service.transports.AssistantServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.assistant_service.transports.AssistantServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssistantServiceTransport( @@ -2113,9 +2126,12 @@ def test_assistant_service_base_transport_with_credentials_file(): def test_assistant_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.assistant_service.transports.AssistantServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.assistant_service.transports.AssistantServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AssistantServiceTransport() @@ -2187,11 +2203,12 @@ def test_assistant_service_transport_auth_gdch_credentials(transport_class): def test_assistant_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py index a19caa1be409..6e54c147d874 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_cmek_config_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,33 +44,33 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.cmek_config_service import ( CmekConfigServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.cmek_config_service import ( CmekConfigServiceClient, - transports, ) +from google.cloud.discoveryengine_v1.services.cmek_config_service import transports from google.cloud.discoveryengine_v1.types import cmek_config_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -868,10 +869,9 @@ def test_cmek_config_service_client_get_mtls_endpoint_and_cert_source(client_cla "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1131,13 +1131,13 @@ def test_cmek_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1243,9 +1243,9 @@ def test_update_cmek_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cmek_config] = ( + mock_rpc + ) request = {} client.update_cmek_config(request) @@ -1941,9 +1941,9 @@ def test_list_cmek_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cmek_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cmek_configs] = ( + mock_rpc + ) request = {} client.list_cmek_configs(request) @@ -2277,9 +2277,9 @@ def test_delete_cmek_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cmek_config] = ( + mock_rpc + ) request = {} client.delete_cmek_config(request) @@ -2558,9 +2558,9 @@ def test_update_cmek_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_cmek_config] = ( + mock_rpc + ) request = {} client.update_cmek_config(request) @@ -2914,9 +2914,9 @@ def test_list_cmek_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_cmek_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_cmek_configs] = ( + mock_rpc + ) request = {} client.list_cmek_configs(request) @@ -3096,9 +3096,9 @@ def test_delete_cmek_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_cmek_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_cmek_config] = ( + mock_rpc + ) request = {} client.delete_cmek_config(request) @@ -3598,8 +3598,9 @@ def test_update_cmek_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3733,20 +3734,21 @@ def test_update_cmek_config_rest_interceptors(null_interceptor): ) client = CmekConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "post_update_cmek_config" - ) as post, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, - "post_update_cmek_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "pre_update_cmek_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "post_update_cmek_config" + ) as post, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, + "post_update_cmek_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "pre_update_cmek_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3799,8 +3801,9 @@ def test_get_cmek_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3878,18 +3881,20 @@ def test_get_cmek_config_rest_interceptors(null_interceptor): ) client = CmekConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "post_get_cmek_config" - ) as post, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, - "post_get_cmek_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "pre_get_cmek_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "post_get_cmek_config" + ) as post, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, + "post_get_cmek_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "pre_get_cmek_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3944,8 +3949,9 @@ def test_list_cmek_configs_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4005,18 +4011,20 @@ def test_list_cmek_configs_rest_interceptors(null_interceptor): ) client = CmekConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "post_list_cmek_configs" - ) as post, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, - "post_list_cmek_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "pre_list_cmek_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "post_list_cmek_configs" + ) as post, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, + "post_list_cmek_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "pre_list_cmek_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4074,8 +4082,9 @@ def test_delete_cmek_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4132,20 +4141,21 @@ def test_delete_cmek_config_rest_interceptors(null_interceptor): ) client = CmekConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "post_delete_cmek_config" - ) as post, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, - "post_delete_cmek_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CmekConfigServiceRestInterceptor, "pre_delete_cmek_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "post_delete_cmek_config" + ) as post, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, + "post_delete_cmek_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CmekConfigServiceRestInterceptor, "pre_delete_cmek_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4200,8 +4210,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4262,8 +4273,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4322,8 +4334,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4545,11 +4558,14 @@ def test_cmek_config_service_base_transport(): def test_cmek_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.cmek_config_service.transports.CmekConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.cmek_config_service.transports.CmekConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmekConfigServiceTransport( @@ -4566,9 +4582,12 @@ def test_cmek_config_service_base_transport_with_credentials_file(): def test_cmek_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.cmek_config_service.transports.CmekConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.cmek_config_service.transports.CmekConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CmekConfigServiceTransport() @@ -4640,11 +4659,12 @@ def test_cmek_config_service_transport_auth_gdch_credentials(transport_class): def test_cmek_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py index c8b54b2147cf..e9e1fd144506 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_completion_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,38 +44,36 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1.services.completion_service import ( + CompletionServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.completion_service import ( + CompletionServiceClient, +) +from google.cloud.discoveryengine_v1.services.completion_service import transports +from google.cloud.discoveryengine_v1.types import completion +from google.cloud.discoveryengine_v1.types import completion_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.type import date_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1.services.completion_service import ( - CompletionServiceAsyncClient, - CompletionServiceClient, - transports, -) -from google.cloud.discoveryengine_v1.types import ( - completion, - completion_service, - import_config, - purge_config, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -873,10 +872,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1136,13 +1134,13 @@ def test_completion_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3515,8 +3513,9 @@ def test_complete_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3581,17 +3580,20 @@ def test_complete_query_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_complete_query" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_complete_query_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_complete_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "post_complete_query" + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_complete_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "pre_complete_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3651,8 +3653,9 @@ def test_import_suggestion_deny_list_entries_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3711,22 +3714,23 @@ def test_import_suggestion_deny_list_entries_rest_interceptors(null_interceptor) ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_import_suggestion_deny_list_entries", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3781,8 +3785,9 @@ def test_purge_suggestion_deny_list_entries_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3841,22 +3846,23 @@ def test_purge_suggestion_deny_list_entries_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_purge_suggestion_deny_list_entries", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3911,8 +3917,9 @@ def test_import_completion_suggestions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3971,21 +3978,23 @@ def test_import_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_completion_suggestions", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_import_completion_suggestions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4040,8 +4049,9 @@ def test_purge_completion_suggestions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4100,20 +4110,23 @@ def test_purge_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_purge_completion_suggestions" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_purge_completion_suggestions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4168,8 +4181,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4230,8 +4244,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4290,8 +4305,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4536,11 +4552,14 @@ def test_completion_service_base_transport(): def test_completion_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport( @@ -4557,9 +4576,12 @@ def test_completion_service_base_transport_with_credentials_file(): def test_completion_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport() @@ -4631,11 +4653,12 @@ def test_completion_service_transport_auth_gdch_credentials(transport_class): def test_completion_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py index 858483c7e478..5a98029079d9 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_control_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,29 +44,34 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.control_service import ( ControlServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.control_service import ( ControlServiceClient, - pagers, - transports, ) +from google.cloud.discoveryengine_v1.services.control_service import pagers +from google.cloud.discoveryengine_v1.services.control_service import transports from google.cloud.discoveryengine_v1.types import common from google.cloud.discoveryengine_v1.types import control from google.cloud.discoveryengine_v1.types import control as gcd_control from google.cloud.discoveryengine_v1.types import control_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -831,10 +837,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1089,13 +1094,13 @@ def test_control_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4420,8 +4425,9 @@ def test_create_control_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4608,17 +4614,20 @@ def test_create_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_create_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_create_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_create_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_create_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_create_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_create_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4673,8 +4682,9 @@ def test_delete_control_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4733,13 +4743,13 @@ def test_delete_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_delete_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_delete_control" + ) as pre, + ): pre.assert_not_called() pb_message = control_service.DeleteControlRequest.pb( control_service.DeleteControlRequest() @@ -4788,8 +4798,9 @@ def test_update_control_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4980,17 +4991,20 @@ def test_update_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_update_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_update_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_update_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_update_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_update_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_update_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5043,8 +5057,9 @@ def test_get_control_rest_bad_request(request_type=control_service.GetControlReq request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5119,17 +5134,19 @@ def test_get_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_get_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_get_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_get_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5182,8 +5199,9 @@ def test_list_controls_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5246,17 +5264,19 @@ def test_list_controls_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_list_controls" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_list_controls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_list_controls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5316,8 +5336,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5378,8 +5399,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5438,8 +5460,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5654,11 +5677,14 @@ def test_control_service_base_transport(): def test_control_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport( @@ -5675,9 +5701,12 @@ def test_control_service_base_transport_with_credentials_file(): def test_control_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport() @@ -5749,11 +5778,12 @@ def test_control_service_transport_auth_gdch_credentials(transport_class): def test_control_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py index 9081906a5a8e..3ecfc45d5830 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_conversational_search_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,36 +44,44 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.conversational_search_service import ( ConversationalSearchServiceClient, +) +from google.cloud.discoveryengine_v1.services.conversational_search_service import ( pagers, - transports, ) -from google.cloud.discoveryengine_v1.types import ( - conversational_search_service, - safety, - search_service, +from google.cloud.discoveryengine_v1.services.conversational_search_service import ( + transports, ) -from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1.types import answer, assist_answer +from google.cloud.discoveryengine_v1.types import answer +from google.cloud.discoveryengine_v1.types import assist_answer from google.cloud.discoveryengine_v1.types import conversation +from google.cloud.discoveryengine_v1.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1.types import conversational_search_service +from google.cloud.discoveryengine_v1.types import safety +from google.cloud.discoveryengine_v1.types import search_service from google.cloud.discoveryengine_v1.types import session from google.cloud.discoveryengine_v1.types import session as gcd_session +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -902,10 +911,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1176,13 +1184,13 @@ def test_conversational_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1299,9 +1307,9 @@ def test_converse_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -1654,9 +1662,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2007,9 +2015,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2340,9 +2348,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2694,9 +2702,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3036,9 +3044,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -3828,9 +3836,9 @@ def test_stream_answer_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stream_answer_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stream_answer_query] = ( + mock_rpc + ) request = {} client.stream_answer_query(request) @@ -6235,9 +6243,9 @@ def test_converse_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -6436,9 +6444,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -6631,9 +6639,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -6810,9 +6818,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -6994,9 +7002,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -7178,9 +7186,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -7582,9 +7590,9 @@ def test_stream_answer_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.stream_answer_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.stream_answer_query] = ( + mock_rpc + ) request = {} client.stream_answer_query(request) @@ -9729,8 +9737,9 @@ def test_converse_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9796,20 +9805,22 @@ def test_converse_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "pre_converse_conversation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_converse_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9869,8 +9880,9 @@ def test_create_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10063,19 +10075,22 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_create_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10132,8 +10147,9 @@ def test_delete_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10192,13 +10208,14 @@ def test_delete_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_delete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_delete_conversation", + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteConversationRequest.pb( conversational_search_service.DeleteConversationRequest() @@ -10247,8 +10264,9 @@ def test_update_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10445,19 +10463,22 @@ def test_update_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_update_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10514,8 +10535,9 @@ def test_get_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10584,18 +10606,22 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_get_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10648,8 +10674,9 @@ def test_list_conversations_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10714,18 +10741,22 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_list_conversations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10785,8 +10816,9 @@ def test_answer_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10853,18 +10885,20 @@ def test_answer_query_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_answer_query" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_answer_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_answer_query" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_answer_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10924,8 +10958,9 @@ def test_stream_answer_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10996,19 +11031,22 @@ def test_stream_answer_query_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_stream_answer_query", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_stream_answer_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_stream_answer_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_stream_answer_query", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_stream_answer_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_stream_answer_query", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11068,8 +11106,9 @@ def test_get_answer_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11148,18 +11187,20 @@ def test_get_answer_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_get_answer" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_answer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_answer" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_answer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11212,8 +11253,9 @@ def test_create_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11536,18 +11578,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11602,8 +11646,9 @@ def test_delete_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11662,13 +11707,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -11717,8 +11762,9 @@ def test_update_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12045,18 +12091,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12111,8 +12159,9 @@ def test_get_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12187,18 +12236,20 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12251,8 +12302,9 @@ def test_list_sessions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -12317,18 +12369,20 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_sessions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -12388,8 +12442,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12450,8 +12505,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12510,8 +12566,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12927,11 +12984,14 @@ def test_conversational_search_service_base_transport(): def test_conversational_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport( @@ -12948,9 +13008,12 @@ def test_conversational_search_service_base_transport_with_credentials_file(): def test_conversational_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport() @@ -13027,11 +13090,12 @@ def test_conversational_search_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py index a7ee4ba4bf49..eb845463ff88 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_data_store_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,22 +44,34 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1.services.data_store_service import ( + DataStoreServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.data_store_service import ( + DataStoreServiceClient, +) +from google.cloud.discoveryengine_v1.services.data_store_service import pagers +from google.cloud.discoveryengine_v1.services.data_store_service import transports +from google.cloud.discoveryengine_v1.types import cmek_config_service +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import data_store +from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1.types import data_store_service +from google.cloud.discoveryengine_v1.types import document_processing_config +from google.cloud.discoveryengine_v1.types import schema from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -66,21 +79,8 @@ from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1.services.data_store_service import ( - DataStoreServiceAsyncClient, - DataStoreServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1.types import ( - data_store_service, - document_processing_config, - schema, -) -from google.cloud.discoveryengine_v1.types import cmek_config_service, common -from google.cloud.discoveryengine_v1.types import data_store -from google.cloud.discoveryengine_v1.types import data_store as gcd_data_store CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -871,10 +871,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1134,13 +1133,13 @@ def test_data_store_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1252,9 +1251,9 @@ def test_create_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -1974,9 +1973,9 @@ def test_list_data_stores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -2495,9 +2494,9 @@ def test_delete_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -2854,9 +2853,9 @@ def test_update_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -3152,9 +3151,9 @@ def test_create_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -3554,9 +3553,9 @@ def test_list_data_stores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -3813,9 +3812,9 @@ def test_delete_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -3993,9 +3992,9 @@ def test_update_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -4558,8 +4557,9 @@ def test_create_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4772,20 +4772,21 @@ def test_create_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_create_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_create_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_create_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_create_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_create_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_create_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4838,8 +4839,9 @@ def test_get_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4918,17 +4920,20 @@ def test_get_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_get_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_get_data_store_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_get_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_get_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_get_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_get_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4981,8 +4986,9 @@ def test_list_data_stores_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5045,18 +5051,20 @@ def test_list_data_stores_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_list_data_stores" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_list_data_stores_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_list_data_stores" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_list_data_stores_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5114,8 +5122,9 @@ def test_delete_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5172,20 +5181,21 @@ def test_delete_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_delete_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_delete_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_delete_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_delete_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5240,8 +5250,9 @@ def test_update_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5478,18 +5489,20 @@ def test_update_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_update_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_update_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_update_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_update_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_update_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_update_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5544,8 +5557,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5606,8 +5620,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5666,8 +5681,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5910,11 +5926,14 @@ def test_data_store_service_base_transport(): def test_data_store_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport( @@ -5931,9 +5950,12 @@ def test_data_store_service_base_transport_with_credentials_file(): def test_data_store_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport() @@ -6005,11 +6027,12 @@ def test_data_store_service_transport_auth_gdch_credentials(transport_class): def test_data_store_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py index 1a0ffb28fa1d..501fda26bd18 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_document_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,22 +44,33 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1.services.document_service import ( + DocumentServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.document_service import ( + DocumentServiceClient, +) +from google.cloud.discoveryengine_v1.services.document_service import pagers +from google.cloud.discoveryengine_v1.services.document_service import transports +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import document +from google.cloud.discoveryengine_v1.types import document as gcd_document +from google.cloud.discoveryengine_v1.types import document_service +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -68,21 +80,8 @@ from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore from google.type import date_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1.services.document_service import ( - DocumentServiceAsyncClient, - DocumentServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1.types import ( - document_service, - import_config, - purge_config, -) -from google.cloud.discoveryengine_v1.types import common -from google.cloud.discoveryengine_v1.types import document -from google.cloud.discoveryengine_v1.types import document as gcd_document CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -872,10 +871,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1130,13 +1128,13 @@ def test_document_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3200,9 +3198,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5021,9 +5019,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5984,8 +5982,9 @@ def test_get_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6057,17 +6056,19 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6122,8 +6123,9 @@ def test_list_documents_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6188,17 +6190,20 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_list_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6258,8 +6263,9 @@ def test_create_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6443,17 +6449,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_create_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_create_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6510,8 +6519,9 @@ def test_update_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6697,17 +6707,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_update_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_update_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6762,8 +6775,9 @@ def test_delete_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6822,13 +6836,13 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_delete_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() pb_message = document_service.DeleteDocumentRequest.pb( document_service.DeleteDocumentRequest() @@ -6875,8 +6889,9 @@ def test_import_documents_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6935,19 +6950,21 @@ def test_import_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_import_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_import_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_import_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_import_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_import_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_import_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7002,8 +7019,9 @@ def test_purge_documents_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7062,19 +7080,21 @@ def test_purge_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_purge_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_purge_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_purge_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_purge_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_purge_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_purge_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7129,8 +7149,9 @@ def test_batch_get_documents_metadata_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7194,18 +7215,22 @@ def test_batch_get_documents_metadata_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_batch_get_documents_metadata" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_batch_get_documents_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_batch_get_documents_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata", + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "pre_batch_get_documents_metadata", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7265,8 +7290,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7327,8 +7353,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7387,8 +7414,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7690,11 +7718,14 @@ def test_document_service_base_transport(): def test_document_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport( @@ -7711,9 +7742,12 @@ def test_document_service_base_transport_with_credentials_file(): def test_document_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport() @@ -7785,11 +7819,12 @@ def test_document_service_transport_auth_gdch_credentials(transport_class): def test_document_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py index e372bb58cbd6..ee94a0905cd7 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_engine_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,39 +44,37 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.engine_service import ( EngineServiceAsyncClient, - EngineServiceClient, - pagers, - transports, ) +from google.cloud.discoveryengine_v1.services.engine_service import EngineServiceClient +from google.cloud.discoveryengine_v1.services.engine_service import pagers +from google.cloud.discoveryengine_v1.services.engine_service import transports from google.cloud.discoveryengine_v1.types import common from google.cloud.discoveryengine_v1.types import engine from google.cloud.discoveryengine_v1.types import engine as gcd_engine from google.cloud.discoveryengine_v1.types import engine_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -837,10 +836,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1095,13 +1093,13 @@ def test_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4491,8 +4489,9 @@ def test_create_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4654,19 +4653,20 @@ def test_create_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EngineServiceRestInterceptor, "post_create_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_create_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_create_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_create_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4721,8 +4721,9 @@ def test_delete_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4781,19 +4782,20 @@ def test_delete_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EngineServiceRestInterceptor, "post_delete_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_delete_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_delete_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_delete_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4850,8 +4852,9 @@ def test_update_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5033,17 +5036,19 @@ def test_update_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_update_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_update_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_update_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5096,8 +5101,9 @@ def test_get_engine_rest_bad_request(request_type=engine_service.GetEngineReques request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5172,17 +5178,19 @@ def test_get_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_get_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_get_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_get_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5233,8 +5241,9 @@ def test_list_engines_rest_bad_request(request_type=engine_service.ListEnginesRe request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5297,17 +5306,19 @@ def test_list_engines_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_list_engines" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_list_engines" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_list_engines" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5364,8 +5375,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5426,8 +5438,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5486,8 +5499,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5724,11 +5738,14 @@ def test_engine_service_base_transport(): def test_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport( @@ -5745,9 +5762,12 @@ def test_engine_service_base_transport_with_credentials_file(): def test_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport() @@ -5819,11 +5839,12 @@ def test_engine_service_transport_auth_gdch_credentials(transport_class): def test_engine_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py index 398008ddaff5..decb967911b6 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_grounded_generation_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,23 +44,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1.services.grounded_generation_service import ( GroundedGenerationServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.grounded_generation_service import ( GroundedGenerationServiceClient, +) +from google.cloud.discoveryengine_v1.services.grounded_generation_service import ( transports, ) -from google.cloud.discoveryengine_v1.types import grounded_generation_service, grounding +from google.cloud.discoveryengine_v1.types import grounded_generation_service +from google.cloud.discoveryengine_v1.types import grounding +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -885,10 +894,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1159,13 +1167,13 @@ def test_grounded_generation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2370,8 +2378,9 @@ def test_generate_grounded_content_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2435,20 +2444,22 @@ def test_generate_grounded_content_rest_interceptors(null_interceptor): ) client = GroundedGenerationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_generate_grounded_content", - ) as post, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_generate_grounded_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "pre_generate_grounded_content", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_generate_grounded_content", + ) as post, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_generate_grounded_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "pre_generate_grounded_content", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2512,8 +2523,9 @@ def test_check_grounding_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2580,18 +2592,20 @@ def test_check_grounding_rest_interceptors(null_interceptor): ) client = GroundedGenerationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, "post_check_grounding" - ) as post, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_check_grounding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "post_check_grounding" + ) as post, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_check_grounding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2651,8 +2665,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2713,8 +2728,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2773,8 +2789,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2929,11 +2946,14 @@ def test_grounded_generation_service_base_transport(): def test_grounded_generation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport( @@ -2950,9 +2970,12 @@ def test_grounded_generation_service_base_transport_with_credentials_file(): def test_grounded_generation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport() @@ -3026,11 +3049,12 @@ def test_grounded_generation_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py index 4af73fc19628..66251a424dfb 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_identity_mapping_store_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,39 +44,43 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( IdentityMappingStoreServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( IdentityMappingStoreServiceClient, +) +from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( pagers, +) +from google.cloud.discoveryengine_v1.services.identity_mapping_store_service import ( transports, ) +from google.cloud.discoveryengine_v1.types import cmek_config_service +from google.cloud.discoveryengine_v1.types import identity_mapping_store from google.cloud.discoveryengine_v1.types import ( identity_mapping_store as gcd_identity_mapping_store, ) from google.cloud.discoveryengine_v1.types import identity_mapping_store_service -from google.cloud.discoveryengine_v1.types import cmek_config_service -from google.cloud.discoveryengine_v1.types import identity_mapping_store +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -905,10 +910,9 @@ def test_identity_mapping_store_service_client_get_mtls_endpoint_and_cert_source "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1179,13 +1183,13 @@ def test_identity_mapping_store_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2902,9 +2906,9 @@ def test_list_identity_mappings_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_identity_mappings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_identity_mappings] = ( + mock_rpc + ) request = {} client.list_identity_mappings(request) @@ -4726,9 +4730,9 @@ def test_list_identity_mappings_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_identity_mappings - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_identity_mappings] = ( + mock_rpc + ) request = {} client.list_identity_mappings(request) @@ -5690,8 +5694,9 @@ def test_create_identity_mapping_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5843,20 +5848,22 @@ def test_create_identity_mapping_store_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_create_identity_mapping_store", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_create_identity_mapping_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_create_identity_mapping_store", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_create_identity_mapping_store", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_create_identity_mapping_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_create_identity_mapping_store", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5918,8 +5925,9 @@ def test_get_identity_mapping_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5986,20 +5994,22 @@ def test_get_identity_mapping_store_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_get_identity_mapping_store", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_get_identity_mapping_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_get_identity_mapping_store", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_get_identity_mapping_store", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_get_identity_mapping_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_get_identity_mapping_store", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6059,8 +6069,9 @@ def test_delete_identity_mapping_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6119,22 +6130,23 @@ def test_delete_identity_mapping_store_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_delete_identity_mapping_store", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_delete_identity_mapping_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_delete_identity_mapping_store", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_delete_identity_mapping_store", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_delete_identity_mapping_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_delete_identity_mapping_store", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6191,8 +6203,9 @@ def test_import_identity_mappings_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6251,22 +6264,23 @@ def test_import_identity_mappings_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_import_identity_mappings", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_import_identity_mappings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_import_identity_mappings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_import_identity_mappings", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_import_identity_mappings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_import_identity_mappings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6321,8 +6335,9 @@ def test_purge_identity_mappings_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6381,22 +6396,23 @@ def test_purge_identity_mappings_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_purge_identity_mappings", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_purge_identity_mappings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_purge_identity_mappings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_purge_identity_mappings", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_purge_identity_mappings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_purge_identity_mappings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6451,8 +6467,9 @@ def test_list_identity_mappings_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6519,20 +6536,22 @@ def test_list_identity_mappings_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_list_identity_mappings", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_list_identity_mappings_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_list_identity_mappings", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_list_identity_mappings", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_list_identity_mappings_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_list_identity_mappings", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6594,8 +6613,9 @@ def test_list_identity_mapping_stores_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6662,20 +6682,22 @@ def test_list_identity_mapping_stores_rest_interceptors(null_interceptor): ) client = IdentityMappingStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_list_identity_mapping_stores", - ) as post, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "post_list_identity_mapping_stores_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.IdentityMappingStoreServiceRestInterceptor, - "pre_list_identity_mapping_stores", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_list_identity_mapping_stores", + ) as post, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "post_list_identity_mapping_stores_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.IdentityMappingStoreServiceRestInterceptor, + "pre_list_identity_mapping_stores", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6739,8 +6761,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6801,8 +6824,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6861,8 +6885,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7155,11 +7180,14 @@ def test_identity_mapping_store_service_base_transport(): def test_identity_mapping_store_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.identity_mapping_store_service.transports.IdentityMappingStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.identity_mapping_store_service.transports.IdentityMappingStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IdentityMappingStoreServiceTransport( @@ -7176,9 +7204,12 @@ def test_identity_mapping_store_service_base_transport_with_credentials_file(): def test_identity_mapping_store_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.identity_mapping_store_service.transports.IdentityMappingStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.identity_mapping_store_service.transports.IdentityMappingStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.IdentityMappingStoreServiceTransport() @@ -7257,11 +7288,12 @@ def test_identity_mapping_store_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py index e4b41b6772d7..e253dc5db228 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_project_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,32 +44,33 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1.services.project_service import ( ProjectServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.project_service import ( ProjectServiceClient, - transports, ) -from google.cloud.discoveryengine_v1.types import project, project_service +from google.cloud.discoveryengine_v1.services.project_service import transports +from google.cloud.discoveryengine_v1.types import project +from google.cloud.discoveryengine_v1.types import project_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -834,10 +836,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1092,13 +1093,13 @@ def test_project_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1208,9 +1209,9 @@ def test_provision_project_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -1487,9 +1488,9 @@ def test_provision_project_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -1849,8 +1850,9 @@ def test_provision_project_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1907,19 +1909,21 @@ def test_provision_project_rest_interceptors(null_interceptor): ) client = ProjectServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_provision_project" - ) as post, mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_provision_project_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectServiceRestInterceptor, "pre_provision_project" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.ProjectServiceRestInterceptor, "post_provision_project" + ) as post, + mock.patch.object( + transports.ProjectServiceRestInterceptor, + "post_provision_project_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "pre_provision_project" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1974,8 +1978,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2036,8 +2041,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2096,8 +2102,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2252,11 +2259,14 @@ def test_project_service_base_transport(): def test_project_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport( @@ -2273,9 +2283,12 @@ def test_project_service_base_transport_with_credentials_file(): def test_project_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport() @@ -2347,11 +2360,12 @@ def test_project_service_transport_auth_gdch_credentials(transport_class): def test_project_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py index 723f9c1ca9fe..d26e49de7014 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_rank_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,23 +44,24 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1.services.rank_service import RankServiceAsyncClient +from google.cloud.discoveryengine_v1.services.rank_service import RankServiceClient +from google.cloud.discoveryengine_v1.services.rank_service import transports +from google.cloud.discoveryengine_v1.types import rank_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account +import google.auth -from google.cloud.discoveryengine_v1.services.rank_service import ( - RankServiceAsyncClient, - RankServiceClient, - transports, -) -from google.cloud.discoveryengine_v1.types import rank_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -802,10 +804,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1046,13 +1047,13 @@ def test_rank_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1196,9 +1197,9 @@ async def test_rank_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.rank - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.rank] = ( + mock_rpc + ) request = {} await client.rank(request) @@ -1621,8 +1622,9 @@ def test_rank_rest_bad_request(request_type=rank_service.RankRequest): request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1684,17 +1686,15 @@ def test_rank_rest_interceptors(null_interceptor): ) client = RankServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.RankServiceRestInterceptor, "post_rank" - ) as post, mock.patch.object( - transports.RankServiceRestInterceptor, "post_rank_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RankServiceRestInterceptor, "pre_rank" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RankServiceRestInterceptor, "post_rank") as post, + mock.patch.object( + transports.RankServiceRestInterceptor, "post_rank_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RankServiceRestInterceptor, "pre_rank") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1747,8 +1747,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1809,8 +1810,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1869,8 +1871,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2001,11 +2004,14 @@ def test_rank_service_base_transport(): def test_rank_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport( @@ -2022,9 +2028,12 @@ def test_rank_service_base_transport_with_credentials_file(): def test_rank_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport() @@ -2096,11 +2105,12 @@ def test_rank_service_transport_auth_gdch_credentials(transport_class): def test_rank_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py index a8f3279c99f8..0aa52c95c56c 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_recommendation_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,30 +44,33 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1.services.recommendation_service import ( + RecommendationServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.recommendation_service import ( + RecommendationServiceClient, +) +from google.cloud.discoveryengine_v1.services.recommendation_service import transports +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import recommendation_service +from google.cloud.discoveryengine_v1.types import user_event from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1.services.recommendation_service import ( - RecommendationServiceAsyncClient, - RecommendationServiceClient, - transports, -) -from google.cloud.discoveryengine_v1.types import ( - common, - recommendation_service, - user_event, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -881,10 +885,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1152,13 +1155,13 @@ def test_recommendation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1749,8 +1752,9 @@ def test_recommend_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1819,17 +1823,20 @@ def test_recommend_rest_interceptors(null_interceptor): ) client = RecommendationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "post_recommend" - ) as post, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "post_recommend_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "pre_recommend" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "post_recommend" + ) as post, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, + "post_recommend_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "pre_recommend" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1889,8 +1896,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1951,8 +1959,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2011,8 +2020,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2143,11 +2153,14 @@ def test_recommendation_service_base_transport(): def test_recommendation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport( @@ -2164,9 +2177,12 @@ def test_recommendation_service_base_transport_with_credentials_file(): def test_recommendation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport() @@ -2238,11 +2254,12 @@ def test_recommendation_service_transport_auth_gdch_credentials(transport_class) def test_recommendation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py index d0950d7e8cf4..94c2614fc015 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_schema_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,37 +44,35 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.schema_service import ( SchemaServiceAsyncClient, - SchemaServiceClient, - pagers, - transports, ) +from google.cloud.discoveryengine_v1.services.schema_service import SchemaServiceClient +from google.cloud.discoveryengine_v1.services.schema_service import pagers +from google.cloud.discoveryengine_v1.services.schema_service import transports from google.cloud.discoveryengine_v1.types import schema from google.cloud.discoveryengine_v1.types import schema as gcd_schema from google.cloud.discoveryengine_v1.types import schema_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -835,10 +834,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1093,13 +1091,13 @@ def test_schema_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4255,8 +4253,9 @@ def test_get_schema_rest_bad_request(request_type=schema_service.GetSchemaReques request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4322,17 +4321,19 @@ def test_get_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_get_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_get_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_get_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4383,8 +4384,9 @@ def test_list_schemas_rest_bad_request(request_type=schema_service.ListSchemasRe request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4447,17 +4449,19 @@ def test_list_schemas_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_list_schemas" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_list_schemas" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_list_schemas" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4512,8 +4516,9 @@ def test_create_schema_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4642,19 +4647,20 @@ def test_create_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_create_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_create_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_create_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_create_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4711,8 +4717,9 @@ def test_update_schema_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4845,19 +4852,20 @@ def test_update_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_update_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_update_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_update_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_update_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4912,8 +4920,9 @@ def test_delete_schema_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4972,19 +4981,20 @@ def test_delete_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_delete_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_delete_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_delete_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_delete_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5039,8 +5049,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5101,8 +5112,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5161,8 +5173,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5399,11 +5412,14 @@ def test_schema_service_base_transport(): def test_schema_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport( @@ -5420,9 +5436,12 @@ def test_schema_service_base_transport_with_credentials_file(): def test_schema_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport() @@ -5494,11 +5513,12 @@ def test_schema_service_transport_auth_gdch_credentials(transport_class): def test_schema_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py index 316bd916d62e..37c79ed5cfa1 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,25 +44,29 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1.services.search_service import ( + SearchServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.search_service import SearchServiceClient +from google.cloud.discoveryengine_v1.services.search_service import pagers +from google.cloud.discoveryengine_v1.services.search_service import transports +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import search_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import struct_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1.services.search_service import ( - SearchServiceAsyncClient, - SearchServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1.types import common, search_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -823,10 +828,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1081,13 +1085,13 @@ def test_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1259,9 +1263,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -1574,7 +1578,9 @@ async def test_search_async_pages(): pages = [] # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 - async for page_ in (await client.search(request={})).pages: # pragma: no branch + async for page_ in ( # pragma: no branch + await client.search(request={}) + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -2665,8 +2671,9 @@ def test_search_rest_bad_request(request_type=search_service.SearchRequest): request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2739,17 +2746,17 @@ def test_search_rest_interceptors(null_interceptor): ) client = SearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search" - ) as post, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SearchServiceRestInterceptor, "pre_search" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search" + ) as post, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SearchServiceRestInterceptor, "pre_search") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2802,8 +2809,9 @@ def test_search_lite_rest_bad_request(request_type=search_service.SearchRequest) request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2876,17 +2884,19 @@ def test_search_lite_rest_interceptors(null_interceptor): ) client = SearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_lite" - ) as post, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_lite_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SearchServiceRestInterceptor, "pre_search_lite" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_lite" + ) as post, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_lite_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SearchServiceRestInterceptor, "pre_search_lite" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2941,8 +2951,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3003,8 +3014,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3063,8 +3075,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3216,11 +3229,14 @@ def test_search_service_base_transport(): def test_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport( @@ -3237,9 +3253,12 @@ def test_search_service_base_transport_with_credentials_file(): def test_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport() @@ -3311,11 +3330,12 @@ def test_search_service_transport_auth_gdch_credentials(transport_class): def test_search_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py index 666020fcf542..95637b23b87b 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_search_tuning_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,36 +44,34 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1.services.search_tuning_service import ( SearchTuningServiceAsyncClient, - SearchTuningServiceClient, - transports, ) -from google.cloud.discoveryengine_v1.types import ( - custom_tuning_model, - import_config, - search_tuning_service, +from google.cloud.discoveryengine_v1.services.search_tuning_service import ( + SearchTuningServiceClient, ) +from google.cloud.discoveryengine_v1.services.search_tuning_service import transports +from google.cloud.discoveryengine_v1.types import custom_tuning_model +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import search_tuning_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -885,10 +884,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1156,13 +1154,13 @@ def test_search_tuning_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1276,9 +1274,9 @@ def test_train_custom_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1536,9 +1534,9 @@ def test_list_custom_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -1721,9 +1719,9 @@ def test_train_custom_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1847,9 +1845,9 @@ def test_list_custom_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -2190,8 +2188,9 @@ def test_train_custom_model_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2250,20 +2249,21 @@ def test_train_custom_model_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "post_train_custom_model" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_train_custom_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "post_train_custom_model" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_train_custom_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2318,8 +2318,9 @@ def test_list_custom_models_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2381,18 +2382,20 @@ def test_list_custom_models_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "post_list_custom_models" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_list_custom_models_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "post_list_custom_models" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_list_custom_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2452,8 +2455,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2514,8 +2518,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2574,8 +2579,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2753,11 +2759,14 @@ def test_search_tuning_service_base_transport(): def test_search_tuning_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport( @@ -2774,9 +2783,12 @@ def test_search_tuning_service_base_transport_with_credentials_file(): def test_search_tuning_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport() @@ -2848,11 +2860,12 @@ def test_search_tuning_service_transport_auth_gdch_credentials(transport_class): def test_search_tuning_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py index cfa1c5ffc710..3c650ccbca5a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_serving_config_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,27 +44,33 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1.services.serving_config_service import ( ServingConfigServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.serving_config_service import ( ServingConfigServiceClient, - transports, ) +from google.cloud.discoveryengine_v1.services.serving_config_service import transports +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import search_service from google.cloud.discoveryengine_v1.types import serving_config as gcd_serving_config -from google.cloud.discoveryengine_v1.types import common, search_service from google.cloud.discoveryengine_v1.types import serving_config_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -876,10 +883,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1147,13 +1153,13 @@ def test_serving_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1291,9 +1297,9 @@ def test_update_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -1628,9 +1634,9 @@ def test_update_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -2007,8 +2013,9 @@ def test_update_serving_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2252,18 +2259,20 @@ def test_update_serving_config_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "post_update_serving_config" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_update_serving_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_update_serving_config" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_update_serving_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2320,8 +2329,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2382,8 +2392,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2442,8 +2453,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2576,11 +2588,14 @@ def test_serving_config_service_base_transport(): def test_serving_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport( @@ -2597,9 +2612,12 @@ def test_serving_config_service_base_transport_with_credentials_file(): def test_serving_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport() @@ -2671,11 +2689,12 @@ def test_serving_config_service_transport_auth_gdch_credentials(transport_class) def test_serving_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py index 39fb62d81091..decf8b1f8d63 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_session_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,34 +44,37 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1.services.session_service import ( + SessionServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.session_service import ( + SessionServiceClient, +) +from google.cloud.discoveryengine_v1.services.session_service import pagers +from google.cloud.discoveryengine_v1.services.session_service import transports +from google.cloud.discoveryengine_v1.types import answer +from google.cloud.discoveryengine_v1.types import assist_answer +from google.cloud.discoveryengine_v1.types import conversational_search_service +from google.cloud.discoveryengine_v1.types import safety +from google.cloud.discoveryengine_v1.types import session +from google.cloud.discoveryengine_v1.types import session as gcd_session from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1.services.session_service import ( - SessionServiceAsyncClient, - SessionServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1.types import ( - answer, - assist_answer, - conversational_search_service, - safety, -) -from google.cloud.discoveryengine_v1.types import session -from google.cloud.discoveryengine_v1.types import session as gcd_session CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -836,10 +840,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1094,13 +1097,13 @@ def test_session_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4382,8 +4385,9 @@ def test_create_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4706,17 +4710,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_create_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4771,8 +4778,9 @@ def test_delete_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4831,13 +4839,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -4886,8 +4894,9 @@ def test_update_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5214,17 +5223,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_update_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5279,8 +5291,9 @@ def test_get_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5355,17 +5368,19 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5418,8 +5433,9 @@ def test_list_sessions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5484,17 +5500,19 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5554,8 +5572,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5616,8 +5635,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5676,8 +5696,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5892,11 +5913,14 @@ def test_session_service_base_transport(): def test_session_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport( @@ -5913,9 +5937,12 @@ def test_session_service_base_transport_with_credentials_file(): def test_session_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport() @@ -5987,11 +6014,12 @@ def test_session_service_transport_auth_gdch_credentials(transport_class): def test_session_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py index 2fbeb53a0dbb..b42e7d81e12a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_site_search_engine_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,38 +44,38 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1.services.site_search_engine_service import ( + SiteSearchEngineServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.site_search_engine_service import ( + SiteSearchEngineServiceClient, +) +from google.cloud.discoveryengine_v1.services.site_search_engine_service import pagers +from google.cloud.discoveryengine_v1.services.site_search_engine_service import ( + transports, +) +from google.cloud.discoveryengine_v1.types import site_search_engine +from google.cloud.discoveryengine_v1.types import site_search_engine_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import empty_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1.services.site_search_engine_service import ( - SiteSearchEngineServiceAsyncClient, - SiteSearchEngineServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1.types import ( - site_search_engine, - site_search_engine_service, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -891,10 +892,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1162,13 +1162,13 @@ def test_site_search_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1282,9 +1282,9 @@ def test_get_site_search_engine_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -1621,9 +1621,9 @@ def test_create_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -2586,9 +2586,9 @@ def test_update_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -2932,9 +2932,9 @@ def test_delete_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -3283,9 +3283,9 @@ def test_list_target_sites_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -6250,9 +6250,9 @@ def test_get_site_search_engine_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -6434,9 +6434,9 @@ def test_create_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -6943,9 +6943,9 @@ def test_update_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -7124,9 +7124,9 @@ def test_delete_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -7305,9 +7305,9 @@ def test_list_target_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -9721,8 +9721,9 @@ def test_get_site_search_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9787,18 +9788,22 @@ def test_get_site_search_engine_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_get_site_search_engine" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_site_search_engine_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_site_search_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_get_site_search_engine", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9858,8 +9863,9 @@ def test_create_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10002,20 +10008,21 @@ def test_create_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_create_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_create_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10070,8 +10077,9 @@ def test_batch_create_target_sites_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10130,22 +10138,23 @@ def test_batch_create_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_create_target_sites", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_create_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10200,8 +10209,9 @@ def test_get_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10280,18 +10290,20 @@ def test_get_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10350,8 +10362,9 @@ def test_update_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10496,20 +10509,21 @@ def test_update_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_update_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_update_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10564,8 +10578,9 @@ def test_delete_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10624,20 +10639,21 @@ def test_delete_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_delete_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_delete_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10692,8 +10708,9 @@ def test_list_target_sites_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10762,18 +10779,20 @@ def test_list_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_list_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_list_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10833,8 +10852,9 @@ def test_create_sitemap_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10965,20 +10985,21 @@ def test_create_sitemap_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_create_sitemap" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_create_sitemap_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_create_sitemap" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_create_sitemap" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_create_sitemap_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_create_sitemap" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11033,8 +11054,9 @@ def test_delete_sitemap_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11093,20 +11115,21 @@ def test_delete_sitemap_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_delete_sitemap" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_delete_sitemap_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_sitemap" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_delete_sitemap" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_delete_sitemap_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_sitemap" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11161,8 +11184,9 @@ def test_fetch_sitemaps_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11224,18 +11248,20 @@ def test_fetch_sitemaps_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_fetch_sitemaps" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_sitemaps_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_fetch_sitemaps" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_fetch_sitemaps" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_sitemaps_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_fetch_sitemaps" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11295,8 +11321,9 @@ def test_enable_advanced_site_search_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11355,22 +11382,23 @@ def test_enable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_enable_advanced_site_search", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_enable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11425,8 +11453,9 @@ def test_disable_advanced_site_search_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11485,22 +11514,23 @@ def test_disable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_disable_advanced_site_search", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_disable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11555,8 +11585,9 @@ def test_recrawl_uris_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11615,20 +11646,21 @@ def test_recrawl_uris_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_recrawl_uris_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_recrawl_uris_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11683,8 +11715,9 @@ def test_batch_verify_target_sites_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11743,22 +11776,23 @@ def test_batch_verify_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_verify_target_sites", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_verify_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11813,8 +11847,9 @@ def test_fetch_domain_verification_status_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11885,20 +11920,22 @@ def test_fetch_domain_verification_status_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_fetch_domain_verification_status", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_fetch_domain_verification_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11962,8 +11999,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12024,8 +12062,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12084,8 +12123,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12552,11 +12592,14 @@ def test_site_search_engine_service_base_transport(): def test_site_search_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport( @@ -12573,9 +12616,12 @@ def test_site_search_engine_service_base_transport_with_credentials_file(): def test_site_search_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport() @@ -12649,11 +12695,12 @@ def test_site_search_engine_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py index d47306e7b54f..392ca91b2731 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_event_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -44,22 +45,31 @@ HAS_GOOGLE_AUTH_AIO = False from google.api import httpbody_pb2 # type: ignore -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1.services.user_event_service import ( + UserEventServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.user_event_service import ( + UserEventServiceClient, +) +from google.cloud.discoveryengine_v1.services.user_event_service import transports +from google.cloud.discoveryengine_v1.types import common +from google.cloud.discoveryengine_v1.types import import_config +from google.cloud.discoveryengine_v1.types import purge_config +from google.cloud.discoveryengine_v1.types import user_event +from google.cloud.discoveryengine_v1.types import user_event_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -67,19 +77,8 @@ from google.protobuf import duration_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.type import date_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1.services.user_event_service import ( - UserEventServiceAsyncClient, - UserEventServiceClient, - transports, -) -from google.cloud.discoveryengine_v1.types import ( - common, - import_config, - purge_config, - user_event, - user_event_service, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -870,10 +869,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1133,13 +1131,13 @@ def test_user_event_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1266,9 +1264,9 @@ def test_write_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -1542,9 +1540,9 @@ def test_collect_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -1797,9 +1795,9 @@ def test_purge_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2056,9 +2054,9 @@ def test_import_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -2248,9 +2246,9 @@ def test_write_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -2383,9 +2381,9 @@ def test_collect_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -2538,9 +2536,9 @@ def test_purge_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2676,9 +2674,9 @@ def test_import_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -3128,8 +3126,9 @@ def test_write_user_event_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3345,18 +3344,20 @@ def test_write_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_write_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_write_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_write_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_write_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_write_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_write_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3409,8 +3410,9 @@ def test_collect_user_event_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3472,18 +3474,20 @@ def test_collect_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_collect_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_collect_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_collect_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_collect_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_collect_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_collect_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3536,8 +3540,9 @@ def test_purge_user_events_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3594,20 +3599,21 @@ def test_purge_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_purge_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_purge_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_purge_user_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_purge_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_purge_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_purge_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3660,8 +3666,9 @@ def test_import_user_events_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3718,20 +3725,21 @@ def test_import_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_import_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_import_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_import_user_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_import_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_import_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_import_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3786,8 +3794,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3848,8 +3857,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3908,8 +3918,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4131,11 +4142,14 @@ def test_user_event_service_base_transport(): def test_user_event_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport( @@ -4152,9 +4166,12 @@ def test_user_event_service_base_transport_with_credentials_file(): def test_user_event_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport() @@ -4226,11 +4243,12 @@ def test_user_event_service_transport_auth_gdch_credentials(transport_class): def test_user_event_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py index ab69d29c77d6..472849ebd92c 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1/test_user_license_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,35 +44,36 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1.services.user_license_service import ( + UserLicenseServiceAsyncClient, +) +from google.cloud.discoveryengine_v1.services.user_license_service import ( + UserLicenseServiceClient, +) +from google.cloud.discoveryengine_v1.services.user_license_service import pagers +from google.cloud.discoveryengine_v1.services.user_license_service import transports +from google.cloud.discoveryengine_v1.types import user_license +from google.cloud.discoveryengine_v1.types import user_license_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1.services.user_license_service import ( - UserLicenseServiceAsyncClient, - UserLicenseServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1.types import user_license, user_license_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -874,10 +876,9 @@ def test_user_license_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1137,13 +1138,13 @@ def test_user_license_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1260,9 +1261,9 @@ def test_list_user_licenses_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_user_licenses - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_user_licenses] = ( + mock_rpc + ) request = {} client.list_user_licenses(request) @@ -1997,9 +1998,9 @@ def test_list_user_licenses_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_user_licenses - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_user_licenses] = ( + mock_rpc + ) request = {} client.list_user_licenses(request) @@ -2609,8 +2610,9 @@ def test_list_user_licenses_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2673,18 +2675,20 @@ def test_list_user_licenses_rest_interceptors(null_interceptor): ) client = UserLicenseServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.UserLicenseServiceRestInterceptor, "post_list_user_licenses" - ) as post, mock.patch.object( - transports.UserLicenseServiceRestInterceptor, - "post_list_user_licenses_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserLicenseServiceRestInterceptor, "pre_list_user_licenses" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, "post_list_user_licenses" + ) as post, + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, + "post_list_user_licenses_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, "pre_list_user_licenses" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2742,8 +2746,9 @@ def test_batch_update_user_licenses_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2800,20 +2805,23 @@ def test_batch_update_user_licenses_rest_interceptors(null_interceptor): ) client = UserLicenseServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.UserLicenseServiceRestInterceptor, "post_batch_update_user_licenses" - ) as post, mock.patch.object( - transports.UserLicenseServiceRestInterceptor, - "post_batch_update_user_licenses_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserLicenseServiceRestInterceptor, "pre_batch_update_user_licenses" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, + "post_batch_update_user_licenses", + ) as post, + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, + "post_batch_update_user_licenses_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserLicenseServiceRestInterceptor, + "pre_batch_update_user_licenses", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2868,8 +2876,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2930,8 +2939,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2990,8 +3000,9 @@ def test_list_operations_rest_bad_request( request = json_format.ParseDict({"name": "projects/sample1"}, request) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3169,11 +3180,14 @@ def test_user_license_service_base_transport(): def test_user_license_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1.services.user_license_service.transports.UserLicenseServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1.services.user_license_service.transports.UserLicenseServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserLicenseServiceTransport( @@ -3190,9 +3204,12 @@ def test_user_license_service_base_transport_with_credentials_file(): def test_user_license_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1.services.user_license_service.transports.UserLicenseServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1.services.user_license_service.transports.UserLicenseServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserLicenseServiceTransport() @@ -3264,11 +3281,12 @@ def test_user_license_service_transport_auth_gdch_credentials(transport_class): def test_user_license_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py index a1f833148fea..2dba8a1de92a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_acl_config_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,27 +44,30 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1alpha.services.acl_config_service import ( AclConfigServiceAsyncClient, - AclConfigServiceClient, - transports, ) -from google.cloud.discoveryengine_v1alpha.types import ( - acl_config, - acl_config_service, - common, +from google.cloud.discoveryengine_v1alpha.services.acl_config_service import ( + AclConfigServiceClient, ) +from google.cloud.discoveryengine_v1alpha.services.acl_config_service import transports +from google.cloud.discoveryengine_v1alpha.types import acl_config +from google.cloud.discoveryengine_v1alpha.types import acl_config_service +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -854,10 +858,9 @@ def test_acl_config_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1117,13 +1120,13 @@ def test_acl_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1230,9 +1233,9 @@ def test_update_acl_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_acl_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_acl_config] = ( + mock_rpc + ) request = {} client.update_acl_config(request) @@ -1739,9 +1742,9 @@ def test_update_acl_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_acl_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_acl_config] = ( + mock_rpc + ) request = {} client.update_acl_config(request) @@ -2254,8 +2257,9 @@ def test_update_acl_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2394,18 +2398,20 @@ def test_update_acl_config_rest_interceptors(null_interceptor): ) client = AclConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.AclConfigServiceRestInterceptor, "post_update_acl_config" - ) as post, mock.patch.object( - transports.AclConfigServiceRestInterceptor, - "post_update_acl_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.AclConfigServiceRestInterceptor, "pre_update_acl_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, "post_update_acl_config" + ) as post, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, + "post_update_acl_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, "pre_update_acl_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2458,8 +2464,9 @@ def test_get_acl_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2522,17 +2529,20 @@ def test_get_acl_config_rest_interceptors(null_interceptor): ) client = AclConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.AclConfigServiceRestInterceptor, "post_get_acl_config" - ) as post, mock.patch.object( - transports.AclConfigServiceRestInterceptor, "post_get_acl_config_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.AclConfigServiceRestInterceptor, "pre_get_acl_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, "post_get_acl_config" + ) as post, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, + "post_get_acl_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.AclConfigServiceRestInterceptor, "pre_get_acl_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2590,8 +2600,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2657,8 +2668,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2724,8 +2736,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2881,11 +2894,14 @@ def test_acl_config_service_base_transport(): def test_acl_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.acl_config_service.transports.AclConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.acl_config_service.transports.AclConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AclConfigServiceTransport( @@ -2902,9 +2918,12 @@ def test_acl_config_service_base_transport_with_credentials_file(): def test_acl_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.acl_config_service.transports.AclConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.acl_config_service.transports.AclConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.AclConfigServiceTransport() @@ -2976,11 +2995,12 @@ def test_acl_config_service_transport_auth_gdch_credentials(transport_class): def test_acl_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py index 5a65e370abe9..ceec3a166f4d 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_chunk_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,25 +44,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1alpha.services.chunk_service import ( + ChunkServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.chunk_service import ( + ChunkServiceClient, +) +from google.cloud.discoveryengine_v1alpha.services.chunk_service import pagers +from google.cloud.discoveryengine_v1alpha.services.chunk_service import transports +from google.cloud.discoveryengine_v1alpha.types import chunk +from google.cloud.discoveryengine_v1alpha.types import chunk_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import struct_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1alpha.services.chunk_service import ( - ChunkServiceAsyncClient, - ChunkServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1alpha.types import chunk, chunk_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -808,10 +815,9 @@ def test_chunk_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1062,13 +1068,13 @@ def test_chunk_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2609,8 +2615,9 @@ def test_get_chunk_rest_bad_request(request_type=chunk_service.GetChunkRequest): request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2681,17 +2688,19 @@ def test_get_chunk_rest_interceptors(null_interceptor): ) client = ChunkServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ChunkServiceRestInterceptor, "post_get_chunk" - ) as post, mock.patch.object( - transports.ChunkServiceRestInterceptor, "post_get_chunk_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChunkServiceRestInterceptor, "pre_get_chunk" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "post_get_chunk" + ) as post, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "post_get_chunk_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "pre_get_chunk" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2742,8 +2751,9 @@ def test_list_chunks_rest_bad_request(request_type=chunk_service.ListChunksReque request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2808,17 +2818,19 @@ def test_list_chunks_rest_interceptors(null_interceptor): ) client = ChunkServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ChunkServiceRestInterceptor, "post_list_chunks" - ) as post, mock.patch.object( - transports.ChunkServiceRestInterceptor, "post_list_chunks_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ChunkServiceRestInterceptor, "pre_list_chunks" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "post_list_chunks" + ) as post, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "post_list_chunks_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ChunkServiceRestInterceptor, "pre_list_chunks" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2878,8 +2890,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2945,8 +2958,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3012,8 +3026,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3167,11 +3182,14 @@ def test_chunk_service_base_transport(): def test_chunk_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.chunk_service.transports.ChunkServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.chunk_service.transports.ChunkServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ChunkServiceTransport( @@ -3188,9 +3206,12 @@ def test_chunk_service_base_transport_with_credentials_file(): def test_chunk_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.chunk_service.transports.ChunkServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.chunk_service.transports.ChunkServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ChunkServiceTransport() @@ -3262,11 +3283,12 @@ def test_chunk_service_transport_auth_gdch_credentials(transport_class): def test_chunk_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py index 6a56bbfe7bf4..859d14065e16 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_completion_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,38 +44,36 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1alpha.services.completion_service import ( + CompletionServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.completion_service import ( + CompletionServiceClient, +) +from google.cloud.discoveryengine_v1alpha.services.completion_service import transports +from google.cloud.discoveryengine_v1alpha.types import completion +from google.cloud.discoveryengine_v1alpha.types import completion_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.type import date_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1alpha.services.completion_service import ( - CompletionServiceAsyncClient, - CompletionServiceClient, - transports, -) -from google.cloud.discoveryengine_v1alpha.types import ( - completion, - completion_service, - import_config, - purge_config, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -873,10 +872,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1136,13 +1134,13 @@ def test_completion_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3515,8 +3513,9 @@ def test_complete_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3581,17 +3580,20 @@ def test_complete_query_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_complete_query" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_complete_query_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_complete_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "post_complete_query" + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_complete_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "pre_complete_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3651,8 +3653,9 @@ def test_import_suggestion_deny_list_entries_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3711,22 +3714,23 @@ def test_import_suggestion_deny_list_entries_rest_interceptors(null_interceptor) ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_import_suggestion_deny_list_entries", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3781,8 +3785,9 @@ def test_purge_suggestion_deny_list_entries_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3841,22 +3846,23 @@ def test_purge_suggestion_deny_list_entries_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_purge_suggestion_deny_list_entries", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3911,8 +3917,9 @@ def test_import_completion_suggestions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3971,21 +3978,23 @@ def test_import_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_completion_suggestions", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_import_completion_suggestions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4040,8 +4049,9 @@ def test_purge_completion_suggestions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4100,20 +4110,23 @@ def test_purge_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_purge_completion_suggestions" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_purge_completion_suggestions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4171,8 +4184,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4238,8 +4252,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4305,8 +4320,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4553,11 +4569,14 @@ def test_completion_service_base_transport(): def test_completion_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport( @@ -4574,9 +4593,12 @@ def test_completion_service_base_transport_with_credentials_file(): def test_completion_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport() @@ -4648,11 +4670,12 @@ def test_completion_service_transport_auth_gdch_credentials(transport_class): def test_completion_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py index dc5848e8c4ca..0650b8c0d7ef 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_control_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,29 +44,34 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.control_service import ( ControlServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.control_service import ( ControlServiceClient, - pagers, - transports, ) +from google.cloud.discoveryengine_v1alpha.services.control_service import pagers +from google.cloud.discoveryengine_v1alpha.services.control_service import transports from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.discoveryengine_v1alpha.types import control from google.cloud.discoveryengine_v1alpha.types import control as gcd_control from google.cloud.discoveryengine_v1alpha.types import control_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -831,10 +837,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1089,13 +1094,13 @@ def test_control_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4420,8 +4425,9 @@ def test_create_control_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4587,17 +4593,20 @@ def test_create_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_create_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_create_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_create_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_create_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_create_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_create_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4652,8 +4661,9 @@ def test_delete_control_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4712,13 +4722,13 @@ def test_delete_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_delete_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_delete_control" + ) as pre, + ): pre.assert_not_called() pb_message = control_service.DeleteControlRequest.pb( control_service.DeleteControlRequest() @@ -4767,8 +4777,9 @@ def test_update_control_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4938,17 +4949,20 @@ def test_update_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_update_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_update_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_update_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_update_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_update_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_update_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5001,8 +5015,9 @@ def test_get_control_rest_bad_request(request_type=control_service.GetControlReq request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5077,17 +5092,19 @@ def test_get_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_get_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_get_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_get_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5140,8 +5157,9 @@ def test_list_controls_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5204,17 +5222,19 @@ def test_list_controls_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_list_controls" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_list_controls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_list_controls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5277,8 +5297,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5344,8 +5365,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5411,8 +5433,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5629,11 +5652,14 @@ def test_control_service_base_transport(): def test_control_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport( @@ -5650,9 +5676,12 @@ def test_control_service_base_transport_with_credentials_file(): def test_control_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport() @@ -5724,11 +5753,12 @@ def test_control_service_transport_auth_gdch_credentials(transport_class): def test_control_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py index 1e2fc7a3bf9d..cdcf66204074 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_conversational_search_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,35 +44,43 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( ConversationalSearchServiceClient, +) +from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( pagers, - transports, ) -from google.cloud.discoveryengine_v1alpha.types import ( - conversational_search_service, - search_service, +from google.cloud.discoveryengine_v1alpha.services.conversational_search_service import ( + transports, ) -from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation -from google.cloud.discoveryengine_v1alpha.types import answer, common +from google.cloud.discoveryengine_v1alpha.types import answer +from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.discoveryengine_v1alpha.types import conversation +from google.cloud.discoveryengine_v1alpha.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service +from google.cloud.discoveryengine_v1alpha.types import search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -901,10 +910,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1175,13 +1183,13 @@ def test_conversational_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1301,9 +1309,9 @@ def test_converse_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -1659,9 +1667,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2012,9 +2020,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2345,9 +2353,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2699,9 +2707,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3041,9 +3049,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -5966,9 +5974,9 @@ def test_converse_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -6167,9 +6175,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -6362,9 +6370,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -6541,9 +6549,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -6725,9 +6733,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -6909,9 +6917,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -9269,8 +9277,9 @@ def test_converse_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9339,20 +9348,22 @@ def test_converse_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "pre_converse_conversation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_converse_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9412,8 +9423,9 @@ def test_create_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9615,19 +9627,22 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_create_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9684,8 +9699,9 @@ def test_delete_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9744,13 +9760,14 @@ def test_delete_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_delete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_delete_conversation", + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteConversationRequest.pb( conversational_search_service.DeleteConversationRequest() @@ -9799,8 +9816,9 @@ def test_update_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10006,19 +10024,22 @@ def test_update_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_update_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10075,8 +10096,9 @@ def test_get_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10145,18 +10167,22 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_get_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10209,8 +10235,9 @@ def test_list_conversations_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10275,18 +10302,22 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_list_conversations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10346,8 +10377,9 @@ def test_answer_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10414,18 +10446,20 @@ def test_answer_query_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_answer_query" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_answer_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_answer_query" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_answer_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10485,8 +10519,9 @@ def test_get_answer_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10563,18 +10598,20 @@ def test_get_answer_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_get_answer" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_answer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_answer" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_answer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10627,8 +10664,9 @@ def test_create_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10874,18 +10912,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10940,8 +10980,9 @@ def test_delete_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11000,13 +11041,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -11055,8 +11096,9 @@ def test_update_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11306,18 +11348,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11372,8 +11416,9 @@ def test_get_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11446,18 +11491,20 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11510,8 +11557,9 @@ def test_list_sessions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11576,18 +11624,20 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_sessions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11650,8 +11700,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11717,8 +11768,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11784,8 +11836,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12180,11 +12233,14 @@ def test_conversational_search_service_base_transport(): def test_conversational_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport( @@ -12201,9 +12257,12 @@ def test_conversational_search_service_base_transport_with_credentials_file(): def test_conversational_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport() @@ -12280,11 +12339,12 @@ def test_conversational_search_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py index 9d5f1294fef1..5b6b2bec04be 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_data_store_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,45 +44,45 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.data_store_service import ( DataStoreServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.data_store_service import ( DataStoreServiceClient, - pagers, - transports, ) +from google.cloud.discoveryengine_v1alpha.services.data_store_service import pagers +from google.cloud.discoveryengine_v1alpha.services.data_store_service import transports +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import data_store from google.cloud.discoveryengine_v1alpha.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import document_processing_config from google.cloud.discoveryengine_v1alpha.types import ( document_processing_config as gcd_document_processing_config, ) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import data_store -from google.cloud.discoveryengine_v1alpha.types import data_store_service from google.cloud.discoveryengine_v1alpha.types import schema +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -872,10 +873,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1135,13 +1135,13 @@ def test_data_store_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1251,9 +1251,9 @@ def test_create_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -1965,9 +1965,9 @@ def test_list_data_stores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -2486,9 +2486,9 @@ def test_delete_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -2841,9 +2841,9 @@ def test_update_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -3839,9 +3839,9 @@ def test_create_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -4239,9 +4239,9 @@ def test_list_data_stores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -4499,9 +4499,9 @@ def test_delete_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -4680,9 +4680,9 @@ def test_update_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -5737,8 +5737,9 @@ def test_create_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5930,20 +5931,21 @@ def test_create_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_create_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_create_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_create_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_create_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_create_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_create_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5996,8 +5998,9 @@ def test_get_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6072,17 +6075,20 @@ def test_get_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_get_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_get_data_store_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_get_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_get_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_get_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_get_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6135,8 +6141,9 @@ def test_list_data_stores_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6199,18 +6206,20 @@ def test_list_data_stores_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_list_data_stores" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_list_data_stores_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_list_data_stores" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_list_data_stores_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6268,8 +6277,9 @@ def test_delete_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6326,20 +6336,21 @@ def test_delete_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_delete_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_delete_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_delete_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_delete_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6394,8 +6405,9 @@ def test_update_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6607,18 +6619,20 @@ def test_update_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_update_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_update_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_update_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_update_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_update_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_update_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6673,8 +6687,9 @@ def test_get_document_processing_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6741,19 +6756,22 @@ def test_get_document_processing_config_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_get_document_processing_config", - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_get_document_processing_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_get_document_processing_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_get_document_processing_config", + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_get_document_processing_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "pre_get_document_processing_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6815,8 +6833,9 @@ def test_update_document_processing_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6979,20 +6998,22 @@ def test_update_document_processing_config_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_update_document_processing_config", - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_update_document_processing_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "pre_update_document_processing_config", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_update_document_processing_config", + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_update_document_processing_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "pre_update_document_processing_config", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7055,8 +7076,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7122,8 +7144,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7189,8 +7212,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7481,11 +7505,14 @@ def test_data_store_service_base_transport(): def test_data_store_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport( @@ -7502,9 +7529,12 @@ def test_data_store_service_base_transport_with_credentials_file(): def test_data_store_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport() @@ -7576,11 +7606,12 @@ def test_data_store_service_transport_auth_gdch_credentials(transport_class): def test_data_store_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py index 4cbfbfee7b95..be0dc288fa2c 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_document_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,22 +44,33 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1alpha.services.document_service import ( + DocumentServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.document_service import ( + DocumentServiceClient, +) +from google.cloud.discoveryengine_v1alpha.services.document_service import pagers +from google.cloud.discoveryengine_v1alpha.services.document_service import transports +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import document +from google.cloud.discoveryengine_v1alpha.types import document as gcd_document +from google.cloud.discoveryengine_v1alpha.types import document_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -68,21 +80,8 @@ from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore from google.type import date_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1alpha.services.document_service import ( - DocumentServiceAsyncClient, - DocumentServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1alpha.types import ( - document_service, - import_config, - purge_config, -) -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import document -from google.cloud.discoveryengine_v1alpha.types import document as gcd_document CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -872,10 +871,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1130,13 +1128,13 @@ def test_document_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3200,9 +3198,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -3705,9 +3703,9 @@ def test_get_processed_document_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processed_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processed_document] = ( + mock_rpc + ) request = {} client.get_processed_document(request) @@ -5365,9 +5363,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5626,9 +5624,9 @@ def test_get_processed_document_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_processed_document - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_processed_document] = ( + mock_rpc + ) request = {} client.get_processed_document(request) @@ -6585,8 +6583,9 @@ def test_get_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6658,17 +6657,19 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6723,8 +6724,9 @@ def test_list_documents_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6789,17 +6791,20 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_list_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6859,8 +6864,9 @@ def test_create_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7039,17 +7045,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_create_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_create_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7106,8 +7115,9 @@ def test_update_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7288,17 +7298,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_update_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_update_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7353,8 +7366,9 @@ def test_delete_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7413,13 +7427,13 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_delete_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() pb_message = document_service.DeleteDocumentRequest.pb( document_service.DeleteDocumentRequest() @@ -7466,8 +7480,9 @@ def test_import_documents_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7526,19 +7541,21 @@ def test_import_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_import_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_import_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_import_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_import_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_import_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_import_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7593,8 +7610,9 @@ def test_purge_documents_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7653,19 +7671,21 @@ def test_purge_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_purge_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_purge_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_purge_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_purge_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_purge_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_purge_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7720,8 +7740,9 @@ def test_get_processed_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7787,18 +7808,20 @@ def test_get_processed_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_processed_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_get_processed_document_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_processed_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_processed_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_get_processed_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_processed_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7853,8 +7876,9 @@ def test_batch_get_documents_metadata_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7918,18 +7942,22 @@ def test_batch_get_documents_metadata_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_batch_get_documents_metadata" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_batch_get_documents_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_batch_get_documents_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata", + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "pre_batch_get_documents_metadata", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7992,8 +8020,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8059,8 +8088,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8126,8 +8156,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -8454,11 +8485,14 @@ def test_document_service_base_transport(): def test_document_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport( @@ -8475,9 +8509,12 @@ def test_document_service_base_transport_with_credentials_file(): def test_document_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport() @@ -8549,11 +8586,12 @@ def test_document_service_transport_auth_gdch_credentials(transport_class): def test_document_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py index 1cc557827990..f8e86b3bd19e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_engine_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,39 +44,39 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.engine_service import ( EngineServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.engine_service import ( EngineServiceClient, - pagers, - transports, ) +from google.cloud.discoveryengine_v1alpha.services.engine_service import pagers +from google.cloud.discoveryengine_v1alpha.services.engine_service import transports from google.cloud.discoveryengine_v1alpha.types import common from google.cloud.discoveryengine_v1alpha.types import engine from google.cloud.discoveryengine_v1alpha.types import engine as gcd_engine from google.cloud.discoveryengine_v1alpha.types import engine_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -837,10 +838,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1095,13 +1095,13 @@ def test_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6074,8 +6074,9 @@ def test_create_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6236,19 +6237,20 @@ def test_create_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EngineServiceRestInterceptor, "post_create_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_create_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_create_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_create_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6303,8 +6305,9 @@ def test_delete_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6363,19 +6366,20 @@ def test_delete_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EngineServiceRestInterceptor, "post_delete_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_delete_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_delete_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_delete_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6432,8 +6436,9 @@ def test_update_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6612,17 +6617,19 @@ def test_update_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_update_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_update_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_update_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6675,8 +6682,9 @@ def test_get_engine_rest_bad_request(request_type=engine_service.GetEngineReques request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6749,17 +6757,19 @@ def test_get_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_get_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_get_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_get_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6810,8 +6820,9 @@ def test_list_engines_rest_bad_request(request_type=engine_service.ListEnginesRe request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6874,17 +6885,19 @@ def test_list_engines_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_list_engines" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_list_engines" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_list_engines" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6939,8 +6952,9 @@ def test_pause_engine_rest_bad_request(request_type=engine_service.PauseEngineRe request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7013,17 +7027,19 @@ def test_pause_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_pause_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_pause_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_pause_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_pause_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_pause_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_pause_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7078,8 +7094,9 @@ def test_resume_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7152,17 +7169,19 @@ def test_resume_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_resume_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_resume_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_resume_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_resume_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_resume_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_resume_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7215,8 +7234,9 @@ def test_tune_engine_rest_bad_request(request_type=engine_service.TuneEngineRequ request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7275,19 +7295,20 @@ def test_tune_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EngineServiceRestInterceptor, "post_tune_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_tune_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_tune_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_tune_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_tune_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_tune_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7345,8 +7366,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7412,8 +7434,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7479,8 +7502,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7782,11 +7806,14 @@ def test_engine_service_base_transport(): def test_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport( @@ -7803,9 +7830,12 @@ def test_engine_service_base_transport_with_credentials_file(): def test_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport() @@ -7877,11 +7907,12 @@ def test_engine_service_transport_auth_gdch_credentials(transport_class): def test_engine_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py index fd8195094527..6cae8bd7ee10 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_estimate_billing_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,36 +44,36 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.type import date_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.estimate_billing_service import ( EstimateBillingServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.estimate_billing_service import ( EstimateBillingServiceClient, - transports, ) -from google.cloud.discoveryengine_v1alpha.types import ( - estimate_billing_service, - import_config, +from google.cloud.discoveryengine_v1alpha.services.estimate_billing_service import ( + transports, ) +from google.cloud.discoveryengine_v1alpha.types import estimate_billing_service +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.type import date_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -889,10 +890,9 @@ def test_estimate_billing_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1160,13 +1160,13 @@ def test_estimate_billing_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1276,9 +1276,9 @@ def test_estimate_data_size_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.estimate_data_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.estimate_data_size] = ( + mock_rpc + ) request = {} client.estimate_data_size(request) @@ -1471,9 +1471,9 @@ def test_estimate_data_size_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.estimate_data_size - ] = mock_rpc + client._transport._wrapped_methods[client._transport.estimate_data_size] = ( + mock_rpc + ) request = {} client.estimate_data_size(request) @@ -1762,8 +1762,9 @@ def test_estimate_data_size_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1820,20 +1821,21 @@ def test_estimate_data_size_rest_interceptors(null_interceptor): ) client = EstimateBillingServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EstimateBillingServiceRestInterceptor, "post_estimate_data_size" - ) as post, mock.patch.object( - transports.EstimateBillingServiceRestInterceptor, - "post_estimate_data_size_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EstimateBillingServiceRestInterceptor, "pre_estimate_data_size" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EstimateBillingServiceRestInterceptor, "post_estimate_data_size" + ) as post, + mock.patch.object( + transports.EstimateBillingServiceRestInterceptor, + "post_estimate_data_size_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EstimateBillingServiceRestInterceptor, "pre_estimate_data_size" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1891,8 +1893,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1958,8 +1961,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2025,8 +2029,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2183,11 +2188,14 @@ def test_estimate_billing_service_base_transport(): def test_estimate_billing_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.estimate_billing_service.transports.EstimateBillingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.estimate_billing_service.transports.EstimateBillingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EstimateBillingServiceTransport( @@ -2204,9 +2212,12 @@ def test_estimate_billing_service_base_transport_with_credentials_file(): def test_estimate_billing_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.estimate_billing_service.transports.EstimateBillingServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.estimate_billing_service.transports.EstimateBillingServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EstimateBillingServiceTransport() @@ -2280,11 +2291,12 @@ def test_estimate_billing_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py index 20286bcae0d4..53ec06f5df99 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_evaluation_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,22 +44,32 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1alpha.services.evaluation_service import ( + EvaluationServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.evaluation_service import ( + EvaluationServiceClient, +) +from google.cloud.discoveryengine_v1alpha.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1alpha.services.evaluation_service import transports +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation +from google.cloud.discoveryengine_v1alpha.types import evaluation_service +from google.cloud.discoveryengine_v1alpha.types import search_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -66,20 +77,8 @@ from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1alpha.services.evaluation_service import ( - EvaluationServiceAsyncClient, - EvaluationServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1alpha.types import ( - evaluation_service, - search_service, -) -from google.cloud.discoveryengine_v1alpha.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1alpha.types import common -from google.cloud.discoveryengine_v1alpha.types import evaluation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -878,10 +877,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1141,13 +1139,13 @@ def test_evaluation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1584,9 +1582,9 @@ def test_list_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -2105,9 +2103,9 @@ def test_create_evaluation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) @@ -3131,9 +3129,9 @@ def test_list_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -3389,9 +3387,9 @@ def test_create_evaluation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) @@ -4168,8 +4166,9 @@ def test_get_evaluation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4234,17 +4233,20 @@ def test_get_evaluation_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_get_evaluation" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_get_evaluation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_get_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_get_evaluation" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_get_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_get_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4297,8 +4299,9 @@ def test_list_evaluations_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4361,18 +4364,20 @@ def test_list_evaluations_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_list_evaluations" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_list_evaluations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_list_evaluations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_list_evaluations" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_list_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_list_evaluations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4430,8 +4435,9 @@ def test_create_evaluation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4715,20 +4721,21 @@ def test_create_evaluation_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_create_evaluation" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_create_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_create_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_create_evaluation" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_create_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_create_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4783,8 +4790,9 @@ def test_list_evaluation_results_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4849,18 +4857,20 @@ def test_list_evaluation_results_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_list_evaluation_results" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_list_evaluation_results_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_list_evaluation_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_list_evaluation_results" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_list_evaluation_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_list_evaluation_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4923,8 +4933,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4990,8 +5001,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5057,8 +5069,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5280,11 +5293,14 @@ def test_evaluation_service_base_transport(): def test_evaluation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EvaluationServiceTransport( @@ -5301,9 +5317,12 @@ def test_evaluation_service_base_transport_with_credentials_file(): def test_evaluation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EvaluationServiceTransport() @@ -5375,11 +5394,12 @@ def test_evaluation_service_transport_auth_gdch_credentials(transport_class): def test_evaluation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py index c2fa7313a38a..e3331ad435fd 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_grounded_generation_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,26 +44,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1alpha.services.grounded_generation_service import ( GroundedGenerationServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.grounded_generation_service import ( GroundedGenerationServiceClient, - transports, ) -from google.cloud.discoveryengine_v1alpha.types import ( - grounded_generation_service, - grounding, +from google.cloud.discoveryengine_v1alpha.services.grounded_generation_service import ( + transports, ) +from google.cloud.discoveryengine_v1alpha.types import grounded_generation_service +from google.cloud.discoveryengine_v1alpha.types import grounding +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -888,10 +894,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1162,13 +1167,13 @@ def test_grounded_generation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1745,8 +1750,9 @@ def test_check_grounding_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1813,18 +1819,20 @@ def test_check_grounding_rest_interceptors(null_interceptor): ) client = GroundedGenerationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, "post_check_grounding" - ) as post, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_check_grounding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "post_check_grounding" + ) as post, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_check_grounding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1887,8 +1895,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1954,8 +1963,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2021,8 +2031,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2155,11 +2166,14 @@ def test_grounded_generation_service_base_transport(): def test_grounded_generation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport( @@ -2176,9 +2190,12 @@ def test_grounded_generation_service_base_transport_with_credentials_file(): def test_grounded_generation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport() @@ -2252,11 +2269,12 @@ def test_grounded_generation_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py index 15c3003e549c..faa681d0f9b0 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_project_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,35 +44,35 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.project_service import ( ProjectServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.project_service import ( ProjectServiceClient, - transports, ) +from google.cloud.discoveryengine_v1alpha.services.project_service import transports from google.cloud.discoveryengine_v1alpha.types import project from google.cloud.discoveryengine_v1alpha.types import project as gcd_project from google.cloud.discoveryengine_v1alpha.types import project_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -837,10 +838,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1095,13 +1095,13 @@ def test_project_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1530,9 +1530,9 @@ def test_provision_project_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -1884,9 +1884,9 @@ def test_report_consent_change_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_consent_change - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_consent_change] = ( + mock_rpc + ) request = {} client.report_consent_change(request) @@ -2358,9 +2358,9 @@ def test_provision_project_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -2556,9 +2556,9 @@ def test_report_consent_change_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.report_consent_change - ] = mock_rpc + client._transport._wrapped_methods[client._transport.report_consent_change] = ( + mock_rpc + ) request = {} client.report_consent_change(request) @@ -3026,8 +3026,9 @@ def test_get_project_rest_bad_request(request_type=project_service.GetProjectReq request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3090,17 +3091,19 @@ def test_get_project_rest_interceptors(null_interceptor): ) client = ProjectServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_get_project" - ) as post, mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_get_project_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectServiceRestInterceptor, "pre_get_project" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "post_get_project" + ) as post, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "post_get_project_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "pre_get_project" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3153,8 +3156,9 @@ def test_provision_project_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3211,19 +3215,21 @@ def test_provision_project_rest_interceptors(null_interceptor): ) client = ProjectServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_provision_project" - ) as post, mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_provision_project_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectServiceRestInterceptor, "pre_provision_project" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.ProjectServiceRestInterceptor, "post_provision_project" + ) as post, + mock.patch.object( + transports.ProjectServiceRestInterceptor, + "post_provision_project_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "pre_provision_project" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3276,8 +3282,9 @@ def test_report_consent_change_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3340,18 +3347,20 @@ def test_report_consent_change_rest_interceptors(null_interceptor): ) client = ProjectServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_report_consent_change" - ) as post, mock.patch.object( - transports.ProjectServiceRestInterceptor, - "post_report_consent_change_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ProjectServiceRestInterceptor, "pre_report_consent_change" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "post_report_consent_change" + ) as post, + mock.patch.object( + transports.ProjectServiceRestInterceptor, + "post_report_consent_change_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "pre_report_consent_change" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3409,8 +3418,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3476,8 +3486,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3543,8 +3554,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3745,11 +3757,14 @@ def test_project_service_base_transport(): def test_project_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport( @@ -3766,9 +3781,12 @@ def test_project_service_base_transport_with_credentials_file(): def test_project_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport() @@ -3840,11 +3858,12 @@ def test_project_service_transport_auth_gdch_credentials(transport_class): def test_project_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py index b941c86f6c3f..de796cc44978 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_rank_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,23 +44,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1alpha.services.rank_service import ( RankServiceAsyncClient, - RankServiceClient, - transports, ) +from google.cloud.discoveryengine_v1alpha.services.rank_service import RankServiceClient +from google.cloud.discoveryengine_v1alpha.services.rank_service import transports from google.cloud.discoveryengine_v1alpha.types import rank_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -802,10 +806,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1046,13 +1049,13 @@ def test_rank_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1196,9 +1199,9 @@ async def test_rank_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.rank - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.rank] = ( + mock_rpc + ) request = {} await client.rank(request) @@ -1621,8 +1624,9 @@ def test_rank_rest_bad_request(request_type=rank_service.RankRequest): request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1684,17 +1688,15 @@ def test_rank_rest_interceptors(null_interceptor): ) client = RankServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.RankServiceRestInterceptor, "post_rank" - ) as post, mock.patch.object( - transports.RankServiceRestInterceptor, "post_rank_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RankServiceRestInterceptor, "pre_rank" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RankServiceRestInterceptor, "post_rank") as post, + mock.patch.object( + transports.RankServiceRestInterceptor, "post_rank_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RankServiceRestInterceptor, "pre_rank") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1750,8 +1752,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1817,8 +1820,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1884,8 +1888,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2018,11 +2023,14 @@ def test_rank_service_base_transport(): def test_rank_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport( @@ -2039,9 +2047,12 @@ def test_rank_service_base_transport_with_credentials_file(): def test_rank_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport() @@ -2113,11 +2124,12 @@ def test_rank_service_transport_auth_gdch_credentials(transport_class): def test_rank_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py index 6589fe52c1cb..b6bdb1fa75a6 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_recommendation_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,30 +44,35 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1alpha.services.recommendation_service import ( + RecommendationServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.recommendation_service import ( + RecommendationServiceClient, +) +from google.cloud.discoveryengine_v1alpha.services.recommendation_service import ( + transports, +) +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import recommendation_service +from google.cloud.discoveryengine_v1alpha.types import user_event from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1alpha.services.recommendation_service import ( - RecommendationServiceAsyncClient, - RecommendationServiceClient, - transports, -) -from google.cloud.discoveryengine_v1alpha.types import ( - common, - recommendation_service, - user_event, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -881,10 +887,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1152,13 +1157,13 @@ def test_recommendation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1749,8 +1754,9 @@ def test_recommend_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1819,17 +1825,20 @@ def test_recommend_rest_interceptors(null_interceptor): ) client = RecommendationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "post_recommend" - ) as post, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "post_recommend_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "pre_recommend" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "post_recommend" + ) as post, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, + "post_recommend_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "pre_recommend" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1892,8 +1901,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1959,8 +1969,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2026,8 +2037,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2160,11 +2172,14 @@ def test_recommendation_service_base_transport(): def test_recommendation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport( @@ -2181,9 +2196,12 @@ def test_recommendation_service_base_transport_with_credentials_file(): def test_recommendation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport() @@ -2255,11 +2273,12 @@ def test_recommendation_service_transport_auth_gdch_credentials(transport_class) def test_recommendation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py index 21c1066a96d6..d0250551153e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,39 +44,41 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.sample_query_service import ( SampleQueryServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.sample_query_service import ( SampleQueryServiceClient, - pagers, +) +from google.cloud.discoveryengine_v1alpha.services.sample_query_service import pagers +from google.cloud.discoveryengine_v1alpha.services.sample_query_service import ( transports, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import import_config from google.cloud.discoveryengine_v1alpha.types import sample_query +from google.cloud.discoveryengine_v1alpha.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1alpha.types import sample_query_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from google.type import date_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -878,10 +881,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1141,13 +1143,13 @@ def test_sample_query_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1254,9 +1256,9 @@ def test_get_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -1588,9 +1590,9 @@ def test_list_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -2134,9 +2136,9 @@ def test_create_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -2504,9 +2506,9 @@ def test_update_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -2865,9 +2867,9 @@ def test_delete_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -3196,9 +3198,9 @@ def test_import_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) @@ -3389,9 +3391,9 @@ def test_get_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -3573,9 +3575,9 @@ def test_list_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -3839,9 +3841,9 @@ def test_create_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -4056,9 +4058,9 @@ def test_update_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -4246,9 +4248,9 @@ def test_delete_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -4426,9 +4428,9 @@ def test_import_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) @@ -4971,8 +4973,9 @@ def test_get_sample_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5037,18 +5040,20 @@ def test_get_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "post_get_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_get_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_get_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_get_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_get_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_get_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5103,8 +5108,9 @@ def test_list_sample_queries_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5169,18 +5175,20 @@ def test_list_sample_queries_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "post_list_sample_queries" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_list_sample_queries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_list_sample_queries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_list_sample_queries" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_list_sample_queries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_list_sample_queries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5240,8 +5248,9 @@ def test_create_sample_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5385,18 +5394,20 @@ def test_create_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "post_create_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_create_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_create_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_create_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_create_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_create_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5455,8 +5466,9 @@ def test_update_sample_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5602,18 +5614,20 @@ def test_update_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "post_update_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_update_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_update_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_update_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_update_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_update_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5670,8 +5684,9 @@ def test_delete_sample_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5730,13 +5745,13 @@ def test_delete_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_delete_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_delete_sample_query" + ) as pre, + ): pre.assert_not_called() pb_message = sample_query_service.DeleteSampleQueryRequest.pb( sample_query_service.DeleteSampleQueryRequest() @@ -5783,8 +5798,9 @@ def test_import_sample_queries_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5843,20 +5859,21 @@ def test_import_sample_queries_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "post_import_sample_queries" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_import_sample_queries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_import_sample_queries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_import_sample_queries" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_import_sample_queries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_import_sample_queries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5914,8 +5931,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5981,8 +5999,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6048,8 +6067,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6319,11 +6339,14 @@ def test_sample_query_service_base_transport(): def test_sample_query_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQueryServiceTransport( @@ -6340,9 +6363,12 @@ def test_sample_query_service_base_transport_with_credentials_file(): def test_sample_query_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQueryServiceTransport() @@ -6414,11 +6440,12 @@ def test_sample_query_service_transport_auth_gdch_credentials(transport_class): def test_sample_query_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py index c77feca53e40..b7e456faf999 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_sample_query_set_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,30 +44,39 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( SampleQuerySetServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( SampleQuerySetServiceClient, +) +from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( pagers, +) +from google.cloud.discoveryengine_v1alpha.services.sample_query_set_service import ( transports, ) +from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1alpha.types import sample_query_set from google.cloud.discoveryengine_v1alpha.types import sample_query_set_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -883,10 +893,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1154,13 +1163,13 @@ def test_sample_query_set_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1277,9 +1286,9 @@ def test_get_sample_query_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -1626,9 +1635,9 @@ def test_list_sample_query_sets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) @@ -3163,9 +3172,9 @@ def test_get_sample_query_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -3348,9 +3357,9 @@ def test_list_sample_query_sets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) @@ -4571,8 +4580,9 @@ def test_get_sample_query_set_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4641,18 +4651,20 @@ def test_get_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "post_get_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_get_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_get_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, "post_get_sample_query_set" + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_get_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, "pre_get_sample_query_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4707,8 +4719,9 @@ def test_list_sample_query_sets_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4773,18 +4786,22 @@ def test_list_sample_query_sets_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "post_list_sample_query_sets" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_list_sample_query_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_list_sample_query_sets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_list_sample_query_sets", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_list_sample_query_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_list_sample_query_sets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4842,8 +4859,9 @@ def test_create_sample_query_set_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4985,18 +5003,22 @@ def test_create_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "post_create_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_create_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_create_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_create_sample_query_set", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_create_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_create_sample_query_set", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5058,8 +5080,9 @@ def test_update_sample_query_set_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5205,18 +5228,22 @@ def test_update_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "post_update_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_update_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_update_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_update_sample_query_set", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_update_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_update_sample_query_set", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5276,8 +5303,9 @@ def test_delete_sample_query_set_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5336,13 +5364,14 @@ def test_delete_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_delete_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_delete_sample_query_set", + ) as pre, + ): pre.assert_not_called() pb_message = sample_query_set_service.DeleteSampleQuerySetRequest.pb( sample_query_set_service.DeleteSampleQuerySetRequest() @@ -5392,8 +5421,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5459,8 +5489,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5526,8 +5557,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5754,11 +5786,14 @@ def test_sample_query_set_service_base_transport(): def test_sample_query_set_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQuerySetServiceTransport( @@ -5775,9 +5810,12 @@ def test_sample_query_set_service_base_transport_with_credentials_file(): def test_sample_query_set_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQuerySetServiceTransport() @@ -5851,11 +5889,12 @@ def test_sample_query_set_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py index da5818bbb4b3..9e9022ca4e96 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_schema_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,37 +44,37 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.schema_service import ( SchemaServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.schema_service import ( SchemaServiceClient, - pagers, - transports, ) +from google.cloud.discoveryengine_v1alpha.services.schema_service import pagers +from google.cloud.discoveryengine_v1alpha.services.schema_service import transports from google.cloud.discoveryengine_v1alpha.types import schema from google.cloud.discoveryengine_v1alpha.types import schema as gcd_schema from google.cloud.discoveryengine_v1alpha.types import schema_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -835,10 +836,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1093,13 +1093,13 @@ def test_schema_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4255,8 +4255,9 @@ def test_get_schema_rest_bad_request(request_type=schema_service.GetSchemaReques request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4322,17 +4323,19 @@ def test_get_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_get_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_get_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_get_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4383,8 +4386,9 @@ def test_list_schemas_rest_bad_request(request_type=schema_service.ListSchemasRe request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4447,17 +4451,19 @@ def test_list_schemas_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_list_schemas" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_list_schemas" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_list_schemas" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4512,8 +4518,9 @@ def test_create_schema_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4660,19 +4667,20 @@ def test_create_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_create_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_create_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_create_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_create_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4729,8 +4737,9 @@ def test_update_schema_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4881,19 +4890,20 @@ def test_update_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_update_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_update_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_update_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_update_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4948,8 +4958,9 @@ def test_delete_schema_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5008,19 +5019,20 @@ def test_delete_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_delete_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_delete_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_delete_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_delete_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5078,8 +5090,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5145,8 +5158,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5212,8 +5226,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5452,11 +5467,14 @@ def test_schema_service_base_transport(): def test_schema_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport( @@ -5473,9 +5491,12 @@ def test_schema_service_base_transport_with_credentials_file(): def test_schema_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport() @@ -5547,11 +5568,12 @@ def test_schema_service_transport_auth_gdch_credentials(transport_class): def test_schema_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py index b4d71a0d4c57..0512a55e975a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,25 +44,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1alpha.services.search_service import ( + SearchServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.search_service import ( + SearchServiceClient, +) +from google.cloud.discoveryengine_v1alpha.services.search_service import pagers +from google.cloud.discoveryengine_v1alpha.services.search_service import transports +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import search_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import struct_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1alpha.services.search_service import ( - SearchServiceAsyncClient, - SearchServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1alpha.types import common, search_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -823,10 +830,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1081,13 +1087,13 @@ def test_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1263,9 +1269,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -1580,7 +1586,9 @@ async def test_search_async_pages(): pages = [] # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 - async for page_ in (await client.search(request={})).pages: # pragma: no branch + async for page_ in ( # pragma: no branch + await client.search(request={}) + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -1961,8 +1969,9 @@ def test_search_rest_bad_request(request_type=search_service.SearchRequest): request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2037,17 +2046,17 @@ def test_search_rest_interceptors(null_interceptor): ) client = SearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search" - ) as post, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SearchServiceRestInterceptor, "pre_search" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search" + ) as post, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SearchServiceRestInterceptor, "pre_search") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2105,8 +2114,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2172,8 +2182,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2239,8 +2250,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2373,11 +2385,14 @@ def test_search_service_base_transport(): def test_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport( @@ -2394,9 +2409,12 @@ def test_search_service_base_transport_with_credentials_file(): def test_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport() @@ -2468,11 +2486,12 @@ def test_search_service_transport_auth_gdch_credentials(transport_class): def test_search_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py index f670e3d97490..c2352e6636f0 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_search_tuning_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,36 +44,36 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1alpha.services.search_tuning_service import ( SearchTuningServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.search_tuning_service import ( SearchTuningServiceClient, - transports, ) -from google.cloud.discoveryengine_v1alpha.types import ( - custom_tuning_model, - import_config, - search_tuning_service, +from google.cloud.discoveryengine_v1alpha.services.search_tuning_service import ( + transports, ) +from google.cloud.discoveryengine_v1alpha.types import custom_tuning_model +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import search_tuning_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -885,10 +886,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1156,13 +1156,13 @@ def test_search_tuning_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1276,9 +1276,9 @@ def test_train_custom_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1536,9 +1536,9 @@ def test_list_custom_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -1721,9 +1721,9 @@ def test_train_custom_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1847,9 +1847,9 @@ def test_list_custom_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -2190,8 +2190,9 @@ def test_train_custom_model_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2250,20 +2251,21 @@ def test_train_custom_model_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "post_train_custom_model" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_train_custom_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "post_train_custom_model" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_train_custom_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2318,8 +2320,9 @@ def test_list_custom_models_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2381,18 +2384,20 @@ def test_list_custom_models_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "post_list_custom_models" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_list_custom_models_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "post_list_custom_models" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_list_custom_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2455,8 +2460,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2522,8 +2528,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2589,8 +2596,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2770,11 +2778,14 @@ def test_search_tuning_service_base_transport(): def test_search_tuning_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport( @@ -2791,9 +2802,12 @@ def test_search_tuning_service_base_transport_with_credentials_file(): def test_search_tuning_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport() @@ -2865,11 +2879,12 @@ def test_search_tuning_service_transport_auth_gdch_credentials(transport_class): def test_search_tuning_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py index 5be49262c260..bcc4f20f8f66 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_serving_config_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,31 +44,39 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.serving_config_service import ( ServingConfigServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.serving_config_service import ( ServingConfigServiceClient, - pagers, +) +from google.cloud.discoveryengine_v1alpha.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1alpha.services.serving_config_service import ( transports, ) +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import search_service +from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1alpha.types import common, search_service -from google.cloud.discoveryengine_v1alpha.types import serving_config from google.cloud.discoveryengine_v1alpha.types import serving_config_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -880,10 +889,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1151,13 +1159,13 @@ def test_serving_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1293,9 +1301,9 @@ def test_update_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -1721,9 +1729,9 @@ def test_get_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -2091,9 +2099,9 @@ def test_list_serving_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) @@ -2568,9 +2576,9 @@ def test_update_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -2762,9 +2770,9 @@ def test_get_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -2946,9 +2954,9 @@ def test_list_serving_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) @@ -3516,8 +3524,9 @@ def test_update_serving_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3760,18 +3769,20 @@ def test_update_serving_config_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "post_update_serving_config" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_update_serving_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_update_serving_config" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_update_serving_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3828,8 +3839,9 @@ def test_get_serving_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3920,18 +3932,20 @@ def test_get_serving_config_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "post_get_serving_config" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_get_serving_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_get_serving_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_get_serving_config" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_get_serving_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_get_serving_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3986,8 +4000,9 @@ def test_list_serving_configs_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4052,18 +4067,20 @@ def test_list_serving_configs_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "post_list_serving_configs" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_list_serving_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_list_serving_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_list_serving_configs" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_list_serving_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_list_serving_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4126,8 +4143,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4193,8 +4211,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4260,8 +4279,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4442,11 +4462,14 @@ def test_serving_config_service_base_transport(): def test_serving_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport( @@ -4463,9 +4486,12 @@ def test_serving_config_service_base_transport_with_credentials_file(): def test_serving_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport() @@ -4537,11 +4563,12 @@ def test_serving_config_service_transport_auth_gdch_credentials(transport_class) def test_serving_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py index 8a3f4f04bae0..8745c4b2e2d1 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_session_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,33 +44,36 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1alpha.services.session_service import ( SessionServiceAsyncClient, - SessionServiceClient, - pagers, - transports, ) -from google.cloud.discoveryengine_v1alpha.types import ( - answer, - conversational_search_service, +from google.cloud.discoveryengine_v1alpha.services.session_service import ( + SessionServiceClient, ) +from google.cloud.discoveryengine_v1alpha.services.session_service import pagers +from google.cloud.discoveryengine_v1alpha.services.session_service import transports +from google.cloud.discoveryengine_v1alpha.types import answer +from google.cloud.discoveryengine_v1alpha.types import conversational_search_service from google.cloud.discoveryengine_v1alpha.types import session from google.cloud.discoveryengine_v1alpha.types import session as gcd_session from google.cloud.discoveryengine_v1alpha.types import session_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -835,10 +839,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1093,13 +1096,13 @@ def test_session_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -5191,8 +5194,9 @@ def test_create_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5438,17 +5442,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_create_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5503,8 +5510,9 @@ def test_delete_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5563,13 +5571,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -5618,8 +5626,9 @@ def test_update_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5869,17 +5878,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_update_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5934,8 +5946,9 @@ def test_get_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6008,17 +6021,19 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6071,8 +6086,9 @@ def test_list_sessions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6137,17 +6153,19 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6205,8 +6223,9 @@ def test_list_files_rest_bad_request(request_type=session_service.ListFilesReque request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6271,17 +6290,19 @@ def test_list_files_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_files" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_files_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_list_files" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_files" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_files_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_list_files" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6341,8 +6362,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6408,8 +6430,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6475,8 +6498,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6714,11 +6738,14 @@ def test_session_service_base_transport(): def test_session_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport( @@ -6735,9 +6762,12 @@ def test_session_service_base_transport_with_credentials_file(): def test_session_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport() @@ -6809,11 +6839,12 @@ def test_session_service_transport_auth_gdch_credentials(transport_class): def test_session_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py index 4b5d9bededad..82395d4ca475 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_site_search_engine_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,39 +44,41 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( + SiteSearchEngineServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( + SiteSearchEngineServiceClient, +) +from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( + pagers, +) +from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( + transports, +) +from google.cloud.discoveryengine_v1alpha.types import site_search_engine +from google.cloud.discoveryengine_v1alpha.types import site_search_engine_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import empty_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1alpha.services.site_search_engine_service import ( - SiteSearchEngineServiceAsyncClient, - SiteSearchEngineServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1alpha.types import ( - site_search_engine, - site_search_engine_service, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -892,10 +895,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1163,13 +1165,13 @@ def test_site_search_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1283,9 +1285,9 @@ def test_get_site_search_engine_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -1622,9 +1624,9 @@ def test_create_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -2587,9 +2589,9 @@ def test_update_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -2933,9 +2935,9 @@ def test_delete_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -3284,9 +3286,9 @@ def test_list_target_sites_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -5785,9 +5787,9 @@ def test_get_site_search_engine_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -5969,9 +5971,9 @@ def test_create_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -6478,9 +6480,9 @@ def test_update_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -6659,9 +6661,9 @@ def test_delete_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -6840,9 +6842,9 @@ def test_list_target_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -8927,8 +8929,9 @@ def test_get_site_search_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -8993,18 +8996,22 @@ def test_get_site_search_engine_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_get_site_search_engine" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_site_search_engine_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_site_search_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_get_site_search_engine", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9064,8 +9071,9 @@ def test_create_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9208,20 +9216,21 @@ def test_create_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_create_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_create_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9276,8 +9285,9 @@ def test_batch_create_target_sites_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9336,22 +9346,23 @@ def test_batch_create_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_create_target_sites", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_create_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9406,8 +9417,9 @@ def test_get_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9486,18 +9498,20 @@ def test_get_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9556,8 +9570,9 @@ def test_update_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9702,20 +9717,21 @@ def test_update_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_update_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_update_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9770,8 +9786,9 @@ def test_delete_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9830,20 +9847,21 @@ def test_delete_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_delete_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_delete_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9898,8 +9916,9 @@ def test_list_target_sites_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9968,18 +9987,20 @@ def test_list_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_list_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_list_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10039,8 +10060,9 @@ def test_enable_advanced_site_search_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10099,22 +10121,23 @@ def test_enable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_enable_advanced_site_search", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_enable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10169,8 +10192,9 @@ def test_disable_advanced_site_search_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10229,22 +10253,23 @@ def test_disable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_disable_advanced_site_search", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_disable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10299,8 +10324,9 @@ def test_recrawl_uris_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10359,20 +10385,21 @@ def test_recrawl_uris_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_recrawl_uris_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_recrawl_uris_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10427,8 +10454,9 @@ def test_batch_verify_target_sites_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10487,22 +10515,23 @@ def test_batch_verify_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_verify_target_sites", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_verify_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10557,8 +10586,9 @@ def test_fetch_domain_verification_status_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10629,20 +10659,22 @@ def test_fetch_domain_verification_status_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_fetch_domain_verification_status", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_fetch_domain_verification_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10706,8 +10738,9 @@ def test_set_uri_pattern_document_data_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10766,22 +10799,23 @@ def test_set_uri_pattern_document_data_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_set_uri_pattern_document_data", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_set_uri_pattern_document_data_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_set_uri_pattern_document_data", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_set_uri_pattern_document_data", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_set_uri_pattern_document_data_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_set_uri_pattern_document_data", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10836,8 +10870,9 @@ def test_get_uri_pattern_document_data_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10903,20 +10938,22 @@ def test_get_uri_pattern_document_data_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_uri_pattern_document_data", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_uri_pattern_document_data_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_get_uri_pattern_document_data", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_uri_pattern_document_data", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_uri_pattern_document_data_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_get_uri_pattern_document_data", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10983,8 +11020,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11050,8 +11088,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11117,8 +11156,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11570,11 +11610,14 @@ def test_site_search_engine_service_base_transport(): def test_site_search_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport( @@ -11591,9 +11634,12 @@ def test_site_search_engine_service_base_transport_with_credentials_file(): def test_site_search_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport() @@ -11667,11 +11713,12 @@ def test_site_search_engine_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py index 9a9c237fcb1e..de4e7539756a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1alpha/test_user_event_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -44,22 +45,31 @@ HAS_GOOGLE_AUTH_AIO = False from google.api import httpbody_pb2 # type: ignore -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1alpha.services.user_event_service import ( + UserEventServiceAsyncClient, +) +from google.cloud.discoveryengine_v1alpha.services.user_event_service import ( + UserEventServiceClient, +) +from google.cloud.discoveryengine_v1alpha.services.user_event_service import transports +from google.cloud.discoveryengine_v1alpha.types import common +from google.cloud.discoveryengine_v1alpha.types import import_config +from google.cloud.discoveryengine_v1alpha.types import purge_config +from google.cloud.discoveryengine_v1alpha.types import user_event +from google.cloud.discoveryengine_v1alpha.types import user_event_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -67,19 +77,8 @@ from google.protobuf import duration_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.type import date_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1alpha.services.user_event_service import ( - UserEventServiceAsyncClient, - UserEventServiceClient, - transports, -) -from google.cloud.discoveryengine_v1alpha.types import ( - common, - import_config, - purge_config, - user_event, - user_event_service, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -870,10 +869,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1133,13 +1131,13 @@ def test_user_event_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1264,9 +1262,9 @@ def test_write_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -1538,9 +1536,9 @@ def test_collect_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -1793,9 +1791,9 @@ def test_purge_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2052,9 +2050,9 @@ def test_import_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -2244,9 +2242,9 @@ def test_write_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -2379,9 +2377,9 @@ def test_collect_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -2534,9 +2532,9 @@ def test_purge_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2672,9 +2670,9 @@ def test_import_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -3123,8 +3121,9 @@ def test_write_user_event_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3330,18 +3329,20 @@ def test_write_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_write_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_write_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_write_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_write_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_write_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_write_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3394,8 +3395,9 @@ def test_collect_user_event_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3457,18 +3459,20 @@ def test_collect_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_collect_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_collect_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_collect_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_collect_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_collect_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_collect_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3521,8 +3525,9 @@ def test_purge_user_events_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3579,20 +3584,21 @@ def test_purge_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_purge_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_purge_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_purge_user_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_purge_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_purge_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_purge_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3645,8 +3651,9 @@ def test_import_user_events_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3703,20 +3710,21 @@ def test_import_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_import_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_import_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_import_user_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_import_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_import_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_import_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3774,8 +3782,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3841,8 +3850,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3908,8 +3918,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4133,11 +4144,14 @@ def test_user_event_service_base_transport(): def test_user_event_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport( @@ -4154,9 +4168,12 @@ def test_user_event_service_base_transport_with_credentials_file(): def test_user_event_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1alpha.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1alpha.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport() @@ -4228,11 +4245,12 @@ def test_user_event_service_transport_auth_gdch_credentials(transport_class): def test_user_event_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py index 8304303267b2..677a3f6d940c 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_completion_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,39 +44,37 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1beta.services.completion_service import ( + CompletionServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.completion_service import ( + CompletionServiceClient, +) +from google.cloud.discoveryengine_v1beta.services.completion_service import transports +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import completion +from google.cloud.discoveryengine_v1beta.types import completion_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.type import date_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1beta.services.completion_service import ( - CompletionServiceAsyncClient, - CompletionServiceClient, - transports, -) -from google.cloud.discoveryengine_v1beta.types import ( - common, - completion, - completion_service, - import_config, - purge_config, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -874,10 +873,9 @@ def test_completion_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1137,13 +1135,13 @@ def test_completion_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3971,8 +3969,9 @@ def test_complete_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4037,17 +4036,20 @@ def test_complete_query_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_complete_query" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_complete_query_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_complete_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "post_complete_query" + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_complete_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "pre_complete_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4107,8 +4109,9 @@ def test_advanced_complete_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4173,18 +4176,20 @@ def test_advanced_complete_query_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_advanced_complete_query" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_advanced_complete_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_advanced_complete_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "post_advanced_complete_query" + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_advanced_complete_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, "pre_advanced_complete_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4244,8 +4249,9 @@ def test_import_suggestion_deny_list_entries_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4304,22 +4310,23 @@ def test_import_suggestion_deny_list_entries_rest_interceptors(null_interceptor) ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_import_suggestion_deny_list_entries", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4374,8 +4381,9 @@ def test_purge_suggestion_deny_list_entries_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4434,22 +4442,23 @@ def test_purge_suggestion_deny_list_entries_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_suggestion_deny_list_entries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "pre_purge_suggestion_deny_list_entries", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_suggestion_deny_list_entries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_suggestion_deny_list_entries", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4504,8 +4513,9 @@ def test_import_completion_suggestions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4564,21 +4574,23 @@ def test_import_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_completion_suggestions", - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_import_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_import_completion_suggestions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_import_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_import_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4633,8 +4645,9 @@ def test_purge_completion_suggestions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4693,20 +4706,23 @@ def test_purge_completion_suggestions_rest_interceptors(null_interceptor): ) client = CompletionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.CompletionServiceRestInterceptor, "post_purge_completion_suggestions" - ) as post, mock.patch.object( - transports.CompletionServiceRestInterceptor, - "post_purge_completion_suggestions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.CompletionServiceRestInterceptor, "pre_purge_completion_suggestions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions", + ) as post, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "post_purge_completion_suggestions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.CompletionServiceRestInterceptor, + "pre_purge_completion_suggestions", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4764,8 +4780,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4831,8 +4848,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4898,8 +4916,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5169,11 +5188,14 @@ def test_completion_service_base_transport(): def test_completion_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport( @@ -5190,9 +5212,12 @@ def test_completion_service_base_transport_with_credentials_file(): def test_completion_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.completion_service.transports.CompletionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.CompletionServiceTransport() @@ -5264,11 +5289,12 @@ def test_completion_service_transport_auth_gdch_credentials(transport_class): def test_completion_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py index 8048258d3e3a..edabb320e228 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_control_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,29 +44,34 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.control_service import ( ControlServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.control_service import ( ControlServiceClient, - pagers, - transports, ) +from google.cloud.discoveryengine_v1beta.services.control_service import pagers +from google.cloud.discoveryengine_v1beta.services.control_service import transports from google.cloud.discoveryengine_v1beta.types import common from google.cloud.discoveryengine_v1beta.types import control from google.cloud.discoveryengine_v1beta.types import control as gcd_control from google.cloud.discoveryengine_v1beta.types import control_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -831,10 +837,9 @@ def test_control_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1089,13 +1094,13 @@ def test_control_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4420,8 +4425,9 @@ def test_create_control_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4588,17 +4594,20 @@ def test_create_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_create_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_create_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_create_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_create_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_create_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_create_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4653,8 +4662,9 @@ def test_delete_control_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4713,13 +4723,13 @@ def test_delete_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_delete_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_delete_control" + ) as pre, + ): pre.assert_not_called() pb_message = control_service.DeleteControlRequest.pb( control_service.DeleteControlRequest() @@ -4768,8 +4778,9 @@ def test_update_control_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4940,17 +4951,20 @@ def test_update_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_update_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_update_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_update_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_update_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, + "post_update_control_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_update_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5003,8 +5017,9 @@ def test_get_control_rest_bad_request(request_type=control_service.GetControlReq request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5079,17 +5094,19 @@ def test_get_control_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_get_control" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_get_control" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_get_control_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_get_control" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5142,8 +5159,9 @@ def test_list_controls_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5206,17 +5224,19 @@ def test_list_controls_rest_interceptors(null_interceptor): ) client = ControlServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_list_controls" - ) as post, mock.patch.object( - transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ControlServiceRestInterceptor, "pre_list_controls" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls" + ) as post, + mock.patch.object( + transports.ControlServiceRestInterceptor, "post_list_controls_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.ControlServiceRestInterceptor, "pre_list_controls" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5279,8 +5299,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5346,8 +5367,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5413,8 +5435,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5631,11 +5654,14 @@ def test_control_service_base_transport(): def test_control_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport( @@ -5652,9 +5678,12 @@ def test_control_service_base_transport_with_credentials_file(): def test_control_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.control_service.transports.ControlServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ControlServiceTransport() @@ -5726,11 +5755,12 @@ def test_control_service_transport_auth_gdch_credentials(transport_class): def test_control_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py index 61147daecc7c..cb901e2bba60 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_conversational_search_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,35 +44,42 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( ConversationalSearchServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( ConversationalSearchServiceClient, +) +from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( pagers, - transports, ) -from google.cloud.discoveryengine_v1beta.types import ( - conversational_search_service, - search_service, +from google.cloud.discoveryengine_v1beta.services.conversational_search_service import ( + transports, ) -from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation from google.cloud.discoveryengine_v1beta.types import answer from google.cloud.discoveryengine_v1beta.types import conversation +from google.cloud.discoveryengine_v1beta.types import conversation as gcd_conversation +from google.cloud.discoveryengine_v1beta.types import conversational_search_service +from google.cloud.discoveryengine_v1beta.types import search_service from google.cloud.discoveryengine_v1beta.types import session from google.cloud.discoveryengine_v1beta.types import session as gcd_session +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -901,10 +909,9 @@ def test_conversational_search_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1175,13 +1182,13 @@ def test_conversational_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1301,9 +1308,9 @@ def test_converse_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -1659,9 +1666,9 @@ def test_create_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -2012,9 +2019,9 @@ def test_delete_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -2345,9 +2352,9 @@ def test_update_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -2699,9 +2706,9 @@ def test_get_conversation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -3041,9 +3048,9 @@ def test_list_conversations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -5966,9 +5973,9 @@ def test_converse_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.converse_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.converse_conversation] = ( + mock_rpc + ) request = {} client.converse_conversation(request) @@ -6167,9 +6174,9 @@ def test_create_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_conversation] = ( + mock_rpc + ) request = {} client.create_conversation(request) @@ -6362,9 +6369,9 @@ def test_delete_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_conversation] = ( + mock_rpc + ) request = {} client.delete_conversation(request) @@ -6541,9 +6548,9 @@ def test_update_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_conversation] = ( + mock_rpc + ) request = {} client.update_conversation(request) @@ -6725,9 +6732,9 @@ def test_get_conversation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_conversation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_conversation] = ( + mock_rpc + ) request = {} client.get_conversation(request) @@ -6909,9 +6916,9 @@ def test_list_conversations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_conversations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_conversations] = ( + mock_rpc + ) request = {} client.list_conversations(request) @@ -9269,8 +9276,9 @@ def test_converse_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9339,20 +9347,22 @@ def test_converse_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_converse_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "pre_converse_conversation", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_converse_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_converse_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9412,8 +9422,9 @@ def test_create_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9615,19 +9626,22 @@ def test_create_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_create_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9684,8 +9698,9 @@ def test_delete_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9744,13 +9759,14 @@ def test_delete_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_delete_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_delete_conversation", + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteConversationRequest.pb( conversational_search_service.DeleteConversationRequest() @@ -9799,8 +9815,9 @@ def test_update_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10006,19 +10023,22 @@ def test_update_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_conversation", - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_update_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10075,8 +10095,9 @@ def test_get_conversation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10145,18 +10166,22 @@ def test_get_conversation_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_get_conversation" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_conversation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_conversation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_conversation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_get_conversation", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10209,8 +10234,9 @@ def test_list_conversations_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10275,18 +10301,22 @@ def test_list_conversations_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_list_conversations" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_conversations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_conversations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations", + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_conversations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "pre_list_conversations", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10346,8 +10376,9 @@ def test_answer_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10414,18 +10445,20 @@ def test_answer_query_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_answer_query" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_answer_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_answer_query" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_answer_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_answer_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10485,8 +10518,9 @@ def test_get_answer_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10563,18 +10597,20 @@ def test_get_answer_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_get_answer" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_answer_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_answer" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_answer_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_answer" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10627,8 +10663,9 @@ def test_create_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10874,18 +10911,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_create_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10940,8 +10979,9 @@ def test_delete_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11000,13 +11040,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -11055,8 +11095,9 @@ def test_update_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11306,18 +11347,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_update_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11372,8 +11415,9 @@ def test_get_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11446,18 +11490,20 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_get_session_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_get_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11510,8 +11556,9 @@ def test_list_sessions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11576,18 +11623,20 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = ConversationalSearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, - "post_list_sessions_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, + "post_list_sessions_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ConversationalSearchServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11650,8 +11699,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11717,8 +11767,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -11784,8 +11835,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12180,11 +12232,14 @@ def test_conversational_search_service_base_transport(): def test_conversational_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport( @@ -12201,9 +12256,12 @@ def test_conversational_search_service_base_transport_with_credentials_file(): def test_conversational_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.conversational_search_service.transports.ConversationalSearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ConversationalSearchServiceTransport() @@ -12280,11 +12338,12 @@ def test_conversational_search_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py index 9410038c952b..648a14c2a229 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_data_store_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,22 +44,33 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1beta.services.data_store_service import ( + DataStoreServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.data_store_service import ( + DataStoreServiceClient, +) +from google.cloud.discoveryengine_v1beta.services.data_store_service import pagers +from google.cloud.discoveryengine_v1beta.services.data_store_service import transports +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import data_store +from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store +from google.cloud.discoveryengine_v1beta.types import data_store_service +from google.cloud.discoveryengine_v1beta.types import document_processing_config +from google.cloud.discoveryengine_v1beta.types import schema from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -66,21 +78,8 @@ from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1beta.services.data_store_service import ( - DataStoreServiceAsyncClient, - DataStoreServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1beta.types import ( - data_store_service, - document_processing_config, - schema, -) -from google.cloud.discoveryengine_v1beta.types import data_store as gcd_data_store -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import data_store CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -871,10 +870,9 @@ def test_data_store_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1134,13 +1132,13 @@ def test_data_store_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1250,9 +1248,9 @@ def test_create_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -1960,9 +1958,9 @@ def test_list_data_stores_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -2481,9 +2479,9 @@ def test_delete_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -2834,9 +2832,9 @@ def test_update_data_store_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -3126,9 +3124,9 @@ def test_create_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_data_store] = ( + mock_rpc + ) request = {} client.create_data_store(request) @@ -3526,9 +3524,9 @@ def test_list_data_stores_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_data_stores - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_data_stores] = ( + mock_rpc + ) request = {} client.list_data_stores(request) @@ -3786,9 +3784,9 @@ def test_delete_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_data_store] = ( + mock_rpc + ) request = {} client.delete_data_store(request) @@ -3967,9 +3965,9 @@ def test_update_data_store_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_data_store - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_data_store] = ( + mock_rpc + ) request = {} client.update_data_store(request) @@ -4526,8 +4524,9 @@ def test_create_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4708,20 +4707,21 @@ def test_create_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_create_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_create_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_create_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_create_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_create_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_create_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4774,8 +4774,9 @@ def test_get_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4848,17 +4849,20 @@ def test_get_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_get_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_get_data_store_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_get_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_get_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_get_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_get_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4911,8 +4915,9 @@ def test_list_data_stores_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4975,18 +4980,20 @@ def test_list_data_stores_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_list_data_stores" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_list_data_stores_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_list_data_stores" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_list_data_stores_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_list_data_stores" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5044,8 +5051,9 @@ def test_delete_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5102,20 +5110,21 @@ def test_delete_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_delete_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_delete_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_delete_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_delete_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_delete_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5170,8 +5179,9 @@ def test_update_data_store_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5370,18 +5380,20 @@ def test_update_data_store_rest_interceptors(null_interceptor): ) client = DataStoreServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "post_update_data_store" - ) as post, mock.patch.object( - transports.DataStoreServiceRestInterceptor, - "post_update_data_store_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DataStoreServiceRestInterceptor, "pre_update_data_store" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "post_update_data_store" + ) as post, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, + "post_update_data_store_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DataStoreServiceRestInterceptor, "pre_update_data_store" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5439,8 +5451,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5506,8 +5519,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5573,8 +5587,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5819,11 +5834,14 @@ def test_data_store_service_base_transport(): def test_data_store_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport( @@ -5840,9 +5858,12 @@ def test_data_store_service_base_transport_with_credentials_file(): def test_data_store_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.data_store_service.transports.DataStoreServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DataStoreServiceTransport() @@ -5914,11 +5935,12 @@ def test_data_store_service_transport_auth_gdch_credentials(transport_class): def test_data_store_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py index ce31b43b8ace..0385c8d4c201 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_document_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,22 +44,32 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1beta.services.document_service import ( + DocumentServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.document_service import ( + DocumentServiceClient, +) +from google.cloud.discoveryengine_v1beta.services.document_service import pagers +from google.cloud.discoveryengine_v1beta.services.document_service import transports +from google.cloud.discoveryengine_v1beta.types import document +from google.cloud.discoveryengine_v1beta.types import document as gcd_document +from google.cloud.discoveryengine_v1beta.types import document_service +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -68,20 +79,8 @@ from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore from google.type import date_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1beta.services.document_service import ( - DocumentServiceAsyncClient, - DocumentServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1beta.types import ( - document_service, - import_config, - purge_config, -) -from google.cloud.discoveryengine_v1beta.types import document -from google.cloud.discoveryengine_v1beta.types import document as gcd_document CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -871,10 +870,9 @@ def test_document_service_client_get_mtls_endpoint_and_cert_source(client_class) "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1129,13 +1127,13 @@ def test_document_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -3199,9 +3197,9 @@ def test_import_documents_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5020,9 +5018,9 @@ def test_import_documents_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_documents - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_documents] = ( + mock_rpc + ) request = {} client.import_documents(request) @@ -5983,8 +5981,9 @@ def test_get_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6056,17 +6055,19 @@ def test_get_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_get_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_get_document_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_get_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6121,8 +6122,9 @@ def test_list_documents_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6187,17 +6189,20 @@ def test_list_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_list_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_list_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_list_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_list_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_list_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_list_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6257,8 +6262,9 @@ def test_create_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6427,17 +6433,20 @@ def test_create_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_create_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_create_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_create_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_create_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_create_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_create_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6494,8 +6503,9 @@ def test_update_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6666,17 +6676,20 @@ def test_update_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_document" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_update_document_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_update_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_update_document" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_update_document_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_update_document" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6731,8 +6744,9 @@ def test_delete_document_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6791,13 +6805,13 @@ def test_delete_document_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_delete_document" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_delete_document" + ) as pre, + ): pre.assert_not_called() pb_message = document_service.DeleteDocumentRequest.pb( document_service.DeleteDocumentRequest() @@ -6844,8 +6858,9 @@ def test_import_documents_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6904,19 +6919,21 @@ def test_import_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_import_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_import_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_import_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_import_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_import_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_import_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6971,8 +6988,9 @@ def test_purge_documents_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7031,19 +7049,21 @@ def test_purge_documents_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_purge_documents" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_purge_documents_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_purge_documents" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.DocumentServiceRestInterceptor, "post_purge_documents" + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_purge_documents_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, "pre_purge_documents" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7098,8 +7118,9 @@ def test_batch_get_documents_metadata_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7163,18 +7184,22 @@ def test_batch_get_documents_metadata_rest_interceptors(null_interceptor): ) client = DocumentServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.DocumentServiceRestInterceptor, "post_batch_get_documents_metadata" - ) as post, mock.patch.object( - transports.DocumentServiceRestInterceptor, - "post_batch_get_documents_metadata_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.DocumentServiceRestInterceptor, "pre_batch_get_documents_metadata" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata", + ) as post, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "post_batch_get_documents_metadata_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.DocumentServiceRestInterceptor, + "pre_batch_get_documents_metadata", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7237,8 +7262,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7304,8 +7330,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7371,8 +7398,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7676,11 +7704,14 @@ def test_document_service_base_transport(): def test_document_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport( @@ -7697,9 +7728,12 @@ def test_document_service_base_transport_with_credentials_file(): def test_document_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.document_service.transports.DocumentServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DocumentServiceTransport() @@ -7771,11 +7805,12 @@ def test_document_service_transport_auth_gdch_credentials(transport_class): def test_document_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py index 29bbd93e0192..aa330abd1599 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_engine_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,39 +44,39 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.engine_service import ( EngineServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.engine_service import ( EngineServiceClient, - pagers, - transports, ) +from google.cloud.discoveryengine_v1beta.services.engine_service import pagers +from google.cloud.discoveryengine_v1beta.services.engine_service import transports from google.cloud.discoveryengine_v1beta.types import common from google.cloud.discoveryengine_v1beta.types import engine from google.cloud.discoveryengine_v1beta.types import engine as gcd_engine from google.cloud.discoveryengine_v1beta.types import engine_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -837,10 +838,9 @@ def test_engine_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1095,13 +1095,13 @@ def test_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -6190,8 +6190,9 @@ def test_create_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6337,19 +6338,20 @@ def test_create_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EngineServiceRestInterceptor, "post_create_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_create_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_create_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_create_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_create_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6404,8 +6406,9 @@ def test_delete_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6464,19 +6467,20 @@ def test_delete_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EngineServiceRestInterceptor, "post_delete_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_delete_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_delete_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_delete_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_delete_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6533,8 +6537,9 @@ def test_update_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6700,17 +6705,19 @@ def test_update_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_update_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_update_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_update_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_update_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6763,8 +6770,9 @@ def test_get_engine_rest_bad_request(request_type=engine_service.GetEngineReques request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6839,17 +6847,19 @@ def test_get_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_get_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_get_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_get_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_get_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -6900,8 +6910,9 @@ def test_list_engines_rest_bad_request(request_type=engine_service.ListEnginesRe request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -6964,17 +6975,19 @@ def test_list_engines_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_list_engines" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_list_engines" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_list_engines_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_list_engines" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7029,8 +7042,9 @@ def test_pause_engine_rest_bad_request(request_type=engine_service.PauseEngineRe request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7105,17 +7119,19 @@ def test_pause_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_pause_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_pause_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_pause_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_pause_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_pause_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_pause_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7170,8 +7186,9 @@ def test_resume_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7246,17 +7263,19 @@ def test_resume_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_resume_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_resume_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_resume_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_resume_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_resume_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_resume_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7309,8 +7328,9 @@ def test_tune_engine_rest_bad_request(request_type=engine_service.TuneEngineRequ request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -7369,19 +7389,20 @@ def test_tune_engine_rest_interceptors(null_interceptor): ) client = EngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EngineServiceRestInterceptor, "post_tune_engine" - ) as post, mock.patch.object( - transports.EngineServiceRestInterceptor, "post_tune_engine_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EngineServiceRestInterceptor, "pre_tune_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_tune_engine" + ) as post, + mock.patch.object( + transports.EngineServiceRestInterceptor, "post_tune_engine_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.EngineServiceRestInterceptor, "pre_tune_engine" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -7439,8 +7460,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7506,8 +7528,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7573,8 +7596,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -7876,11 +7900,14 @@ def test_engine_service_base_transport(): def test_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport( @@ -7897,9 +7924,12 @@ def test_engine_service_base_transport_with_credentials_file(): def test_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.engine_service.transports.EngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EngineServiceTransport() @@ -7971,11 +8001,12 @@ def test_engine_service_transport_auth_gdch_credentials(transport_class): def test_engine_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py index 1985bbdb2c5b..0ce3daac1bc2 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_evaluation_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,22 +44,32 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1beta.services.evaluation_service import ( + EvaluationServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.evaluation_service import ( + EvaluationServiceClient, +) +from google.cloud.discoveryengine_v1beta.services.evaluation_service import pagers +from google.cloud.discoveryengine_v1beta.services.evaluation_service import transports +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation +from google.cloud.discoveryengine_v1beta.types import evaluation_service +from google.cloud.discoveryengine_v1beta.types import search_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -66,17 +77,8 @@ from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1beta.services.evaluation_service import ( - EvaluationServiceAsyncClient, - EvaluationServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1beta.types import evaluation_service, search_service -from google.cloud.discoveryengine_v1beta.types import evaluation as gcd_evaluation -from google.cloud.discoveryengine_v1beta.types import common -from google.cloud.discoveryengine_v1beta.types import evaluation CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -875,10 +877,9 @@ def test_evaluation_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1138,13 +1139,13 @@ def test_evaluation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1581,9 +1582,9 @@ def test_list_evaluations_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -2102,9 +2103,9 @@ def test_create_evaluation_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) @@ -3128,9 +3129,9 @@ def test_list_evaluations_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_evaluations - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_evaluations] = ( + mock_rpc + ) request = {} client.list_evaluations(request) @@ -3386,9 +3387,9 @@ def test_create_evaluation_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_evaluation - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_evaluation] = ( + mock_rpc + ) request = {} client.create_evaluation(request) @@ -4165,8 +4166,9 @@ def test_get_evaluation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4231,17 +4233,20 @@ def test_get_evaluation_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_get_evaluation" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_get_evaluation_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_get_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_get_evaluation" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_get_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_get_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4294,8 +4299,9 @@ def test_list_evaluations_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4358,18 +4364,20 @@ def test_list_evaluations_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_list_evaluations" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_list_evaluations_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_list_evaluations" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_list_evaluations" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_list_evaluations_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_list_evaluations" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4427,8 +4435,9 @@ def test_create_evaluation_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4716,20 +4725,21 @@ def test_create_evaluation_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_create_evaluation" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_create_evaluation_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_create_evaluation" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_create_evaluation" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_create_evaluation_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_create_evaluation" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4784,8 +4794,9 @@ def test_list_evaluation_results_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4850,18 +4861,20 @@ def test_list_evaluation_results_rest_interceptors(null_interceptor): ) client = EvaluationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "post_list_evaluation_results" - ) as post, mock.patch.object( - transports.EvaluationServiceRestInterceptor, - "post_list_evaluation_results_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.EvaluationServiceRestInterceptor, "pre_list_evaluation_results" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "post_list_evaluation_results" + ) as post, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, + "post_list_evaluation_results_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.EvaluationServiceRestInterceptor, "pre_list_evaluation_results" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4924,8 +4937,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4991,8 +5005,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5058,8 +5073,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5281,11 +5297,14 @@ def test_evaluation_service_base_transport(): def test_evaluation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EvaluationServiceTransport( @@ -5302,9 +5321,12 @@ def test_evaluation_service_base_transport_with_credentials_file(): def test_evaluation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.evaluation_service.transports.EvaluationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.EvaluationServiceTransport() @@ -5376,11 +5398,12 @@ def test_evaluation_service_transport_auth_gdch_credentials(transport_class): def test_evaluation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py index 62e3fcf87282..cd6e959d850a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_grounded_generation_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,26 +44,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1beta.services.grounded_generation_service import ( GroundedGenerationServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.grounded_generation_service import ( GroundedGenerationServiceClient, - transports, ) -from google.cloud.discoveryengine_v1beta.types import ( - grounded_generation_service, - grounding, +from google.cloud.discoveryengine_v1beta.services.grounded_generation_service import ( + transports, ) +from google.cloud.discoveryengine_v1beta.types import grounded_generation_service +from google.cloud.discoveryengine_v1beta.types import grounding +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -888,10 +894,9 @@ def test_grounded_generation_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1162,13 +1167,13 @@ def test_grounded_generation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -2373,8 +2378,9 @@ def test_generate_grounded_content_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2438,20 +2444,22 @@ def test_generate_grounded_content_rest_interceptors(null_interceptor): ) client = GroundedGenerationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_generate_grounded_content", - ) as post, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_generate_grounded_content_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "pre_generate_grounded_content", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_generate_grounded_content", + ) as post, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_generate_grounded_content_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "pre_generate_grounded_content", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2515,8 +2523,9 @@ def test_check_grounding_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2583,18 +2592,20 @@ def test_check_grounding_rest_interceptors(null_interceptor): ) client = GroundedGenerationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, "post_check_grounding" - ) as post, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, - "post_check_grounding_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "post_check_grounding" + ) as post, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, + "post_check_grounding_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.GroundedGenerationServiceRestInterceptor, "pre_check_grounding" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2657,8 +2668,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2724,8 +2736,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2791,8 +2804,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2949,11 +2963,14 @@ def test_grounded_generation_service_base_transport(): def test_grounded_generation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport( @@ -2970,9 +2987,12 @@ def test_grounded_generation_service_base_transport_with_credentials_file(): def test_grounded_generation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.grounded_generation_service.transports.GroundedGenerationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.GroundedGenerationServiceTransport() @@ -3046,11 +3066,12 @@ def test_grounded_generation_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py index b5378714fa77..89e9d155a58e 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_project_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,32 +44,33 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1beta.services.project_service import ( ProjectServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.project_service import ( ProjectServiceClient, - transports, ) -from google.cloud.discoveryengine_v1beta.types import project, project_service +from google.cloud.discoveryengine_v1beta.services.project_service import transports +from google.cloud.discoveryengine_v1beta.types import project +from google.cloud.discoveryengine_v1beta.types import project_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -834,10 +836,9 @@ def test_project_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1092,13 +1093,13 @@ def test_project_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1208,9 +1209,9 @@ def test_provision_project_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -1487,9 +1488,9 @@ def test_provision_project_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.provision_project - ] = mock_rpc + client._transport._wrapped_methods[client._transport.provision_project] = ( + mock_rpc + ) request = {} client.provision_project(request) @@ -1849,8 +1850,9 @@ def test_provision_project_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1907,19 +1909,21 @@ def test_provision_project_rest_interceptors(null_interceptor): ) client = ProjectServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_provision_project" - ) as post, mock.patch.object( - transports.ProjectServiceRestInterceptor, "post_provision_project_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.ProjectServiceRestInterceptor, "pre_provision_project" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.ProjectServiceRestInterceptor, "post_provision_project" + ) as post, + mock.patch.object( + transports.ProjectServiceRestInterceptor, + "post_provision_project_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ProjectServiceRestInterceptor, "pre_provision_project" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1977,8 +1981,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2044,8 +2049,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2111,8 +2117,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2269,11 +2276,14 @@ def test_project_service_base_transport(): def test_project_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport( @@ -2290,9 +2300,12 @@ def test_project_service_base_transport_with_credentials_file(): def test_project_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.project_service.transports.ProjectServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ProjectServiceTransport() @@ -2364,11 +2377,12 @@ def test_project_service_transport_auth_gdch_credentials(transport_class): def test_project_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py index 1400c396e330..e9b5ff6a69e8 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_rank_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,23 +44,26 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1beta.services.rank_service import ( RankServiceAsyncClient, - RankServiceClient, - transports, ) +from google.cloud.discoveryengine_v1beta.services.rank_service import RankServiceClient +from google.cloud.discoveryengine_v1beta.services.rank_service import transports from google.cloud.discoveryengine_v1beta.types import rank_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -802,10 +806,9 @@ def test_rank_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1046,13 +1049,13 @@ def test_rank_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1196,9 +1199,9 @@ async def test_rank_async_use_cached_wrapped_rpc(transport: str = "grpc_asyncio" # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.rank - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.rank] = ( + mock_rpc + ) request = {} await client.rank(request) @@ -1621,8 +1624,9 @@ def test_rank_rest_bad_request(request_type=rank_service.RankRequest): request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1684,17 +1688,15 @@ def test_rank_rest_interceptors(null_interceptor): ) client = RankServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.RankServiceRestInterceptor, "post_rank" - ) as post, mock.patch.object( - transports.RankServiceRestInterceptor, "post_rank_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RankServiceRestInterceptor, "pre_rank" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(transports.RankServiceRestInterceptor, "post_rank") as post, + mock.patch.object( + transports.RankServiceRestInterceptor, "post_rank_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.RankServiceRestInterceptor, "pre_rank") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1750,8 +1752,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1817,8 +1820,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1884,8 +1888,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2018,11 +2023,14 @@ def test_rank_service_base_transport(): def test_rank_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport( @@ -2039,9 +2047,12 @@ def test_rank_service_base_transport_with_credentials_file(): def test_rank_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.rank_service.transports.RankServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RankServiceTransport() @@ -2113,11 +2124,12 @@ def test_rank_service_transport_auth_gdch_credentials(transport_class): def test_rank_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py index 2e5b7a952978..5a8e1e3d1b89 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_recommendation_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,30 +44,35 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1beta.services.recommendation_service import ( + RecommendationServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.recommendation_service import ( + RecommendationServiceClient, +) +from google.cloud.discoveryengine_v1beta.services.recommendation_service import ( + transports, +) +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import recommendation_service +from google.cloud.discoveryengine_v1beta.types import user_event from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import duration_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1beta.services.recommendation_service import ( - RecommendationServiceAsyncClient, - RecommendationServiceClient, - transports, -) -from google.cloud.discoveryengine_v1beta.types import ( - common, - recommendation_service, - user_event, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -881,10 +887,9 @@ def test_recommendation_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1152,13 +1157,13 @@ def test_recommendation_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1749,8 +1754,9 @@ def test_recommend_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -1819,17 +1825,20 @@ def test_recommend_rest_interceptors(null_interceptor): ) client = RecommendationServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "post_recommend" - ) as post, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "post_recommend_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.RecommendationServiceRestInterceptor, "pre_recommend" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "post_recommend" + ) as post, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, + "post_recommend_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.RecommendationServiceRestInterceptor, "pre_recommend" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -1892,8 +1901,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -1959,8 +1969,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2026,8 +2037,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2160,11 +2172,14 @@ def test_recommendation_service_base_transport(): def test_recommendation_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport( @@ -2181,9 +2196,12 @@ def test_recommendation_service_base_transport_with_credentials_file(): def test_recommendation_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.recommendation_service.transports.RecommendationServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.RecommendationServiceTransport() @@ -2255,11 +2273,12 @@ def test_recommendation_service_transport_auth_gdch_credentials(transport_class) def test_recommendation_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py index 4110b6088825..2e83b10adfdc 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,39 +44,39 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore -from google.type import date_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.sample_query_service import ( SampleQueryServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.sample_query_service import ( SampleQueryServiceClient, - pagers, - transports, ) -from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query +from google.cloud.discoveryengine_v1beta.services.sample_query_service import pagers +from google.cloud.discoveryengine_v1beta.services.sample_query_service import transports from google.cloud.discoveryengine_v1beta.types import import_config from google.cloud.discoveryengine_v1beta.types import sample_query +from google.cloud.discoveryengine_v1beta.types import sample_query as gcd_sample_query from google.cloud.discoveryengine_v1beta.types import sample_query_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +from google.type import date_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -878,10 +879,9 @@ def test_sample_query_service_client_get_mtls_endpoint_and_cert_source(client_cl "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1141,13 +1141,13 @@ def test_sample_query_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1254,9 +1254,9 @@ def test_get_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -1588,9 +1588,9 @@ def test_list_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -2134,9 +2134,9 @@ def test_create_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -2504,9 +2504,9 @@ def test_update_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -2865,9 +2865,9 @@ def test_delete_sample_query_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -3196,9 +3196,9 @@ def test_import_sample_queries_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) @@ -3389,9 +3389,9 @@ def test_get_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query] = ( + mock_rpc + ) request = {} client.get_sample_query(request) @@ -3573,9 +3573,9 @@ def test_list_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_queries] = ( + mock_rpc + ) request = {} client.list_sample_queries(request) @@ -3839,9 +3839,9 @@ def test_create_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_sample_query] = ( + mock_rpc + ) request = {} client.create_sample_query(request) @@ -4056,9 +4056,9 @@ def test_update_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_sample_query] = ( + mock_rpc + ) request = {} client.update_sample_query(request) @@ -4246,9 +4246,9 @@ def test_delete_sample_query_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_sample_query - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_sample_query] = ( + mock_rpc + ) request = {} client.delete_sample_query(request) @@ -4426,9 +4426,9 @@ def test_import_sample_queries_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_sample_queries - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_sample_queries] = ( + mock_rpc + ) request = {} client.import_sample_queries(request) @@ -4971,8 +4971,9 @@ def test_get_sample_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5037,18 +5038,20 @@ def test_get_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "post_get_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_get_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_get_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_get_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_get_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_get_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5103,8 +5106,9 @@ def test_list_sample_queries_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5169,18 +5173,20 @@ def test_list_sample_queries_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "post_list_sample_queries" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_list_sample_queries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_list_sample_queries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_list_sample_queries" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_list_sample_queries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_list_sample_queries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5240,8 +5246,9 @@ def test_create_sample_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5385,18 +5392,20 @@ def test_create_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "post_create_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_create_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_create_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_create_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_create_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_create_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5455,8 +5464,9 @@ def test_update_sample_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5602,18 +5612,20 @@ def test_update_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "post_update_sample_query" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_update_sample_query_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_update_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_update_sample_query" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_update_sample_query_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_update_sample_query" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5670,8 +5682,9 @@ def test_delete_sample_query_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5730,13 +5743,13 @@ def test_delete_sample_query_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_delete_sample_query" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_delete_sample_query" + ) as pre, + ): pre.assert_not_called() pb_message = sample_query_service.DeleteSampleQueryRequest.pb( sample_query_service.DeleteSampleQueryRequest() @@ -5783,8 +5796,9 @@ def test_import_sample_queries_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5843,20 +5857,21 @@ def test_import_sample_queries_rest_interceptors(null_interceptor): ) client = SampleQueryServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "post_import_sample_queries" - ) as post, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, - "post_import_sample_queries_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQueryServiceRestInterceptor, "pre_import_sample_queries" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "post_import_sample_queries" + ) as post, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, + "post_import_sample_queries_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQueryServiceRestInterceptor, "pre_import_sample_queries" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5914,8 +5929,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5981,8 +5997,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6048,8 +6065,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -6319,11 +6337,14 @@ def test_sample_query_service_base_transport(): def test_sample_query_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQueryServiceTransport( @@ -6340,9 +6361,12 @@ def test_sample_query_service_base_transport_with_credentials_file(): def test_sample_query_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.sample_query_service.transports.SampleQueryServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQueryServiceTransport() @@ -6414,11 +6438,12 @@ def test_sample_query_service_transport_auth_gdch_credentials(transport_class): def test_sample_query_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py index 90e4b6193de8..a1e5dd074c04 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_sample_query_set_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,30 +44,37 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import ( SampleQuerySetServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import ( SampleQuerySetServiceClient, - pagers, +) +from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import pagers +from google.cloud.discoveryengine_v1beta.services.sample_query_set_service import ( transports, ) +from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import ( sample_query_set as gcd_sample_query_set, ) -from google.cloud.discoveryengine_v1beta.types import sample_query_set from google.cloud.discoveryengine_v1beta.types import sample_query_set_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -883,10 +891,9 @@ def test_sample_query_set_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1154,13 +1161,13 @@ def test_sample_query_set_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1277,9 +1284,9 @@ def test_get_sample_query_set_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -1626,9 +1633,9 @@ def test_list_sample_query_sets_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) @@ -3163,9 +3170,9 @@ def test_get_sample_query_set_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_sample_query_set - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_sample_query_set] = ( + mock_rpc + ) request = {} client.get_sample_query_set(request) @@ -3348,9 +3355,9 @@ def test_list_sample_query_sets_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_sample_query_sets - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_sample_query_sets] = ( + mock_rpc + ) request = {} client.list_sample_query_sets(request) @@ -4571,8 +4578,9 @@ def test_get_sample_query_set_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4641,18 +4649,20 @@ def test_get_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "post_get_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_get_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_get_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, "post_get_sample_query_set" + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_get_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, "pre_get_sample_query_set" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4707,8 +4717,9 @@ def test_list_sample_query_sets_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4773,18 +4784,22 @@ def test_list_sample_query_sets_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "post_list_sample_query_sets" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_list_sample_query_sets_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_list_sample_query_sets" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_list_sample_query_sets", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_list_sample_query_sets_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_list_sample_query_sets", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4842,8 +4857,9 @@ def test_create_sample_query_set_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4985,18 +5001,22 @@ def test_create_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "post_create_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_create_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_create_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_create_sample_query_set", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_create_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_create_sample_query_set", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5058,8 +5078,9 @@ def test_update_sample_query_set_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5205,18 +5226,22 @@ def test_update_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "post_update_sample_query_set" - ) as post, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, - "post_update_sample_query_set_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_update_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_update_sample_query_set", + ) as post, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "post_update_sample_query_set_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_update_sample_query_set", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5276,8 +5301,9 @@ def test_delete_sample_query_set_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5336,13 +5362,14 @@ def test_delete_sample_query_set_rest_interceptors(null_interceptor): ) client = SampleQuerySetServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SampleQuerySetServiceRestInterceptor, "pre_delete_sample_query_set" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SampleQuerySetServiceRestInterceptor, + "pre_delete_sample_query_set", + ) as pre, + ): pre.assert_not_called() pb_message = sample_query_set_service.DeleteSampleQuerySetRequest.pb( sample_query_set_service.DeleteSampleQuerySetRequest() @@ -5392,8 +5419,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5459,8 +5487,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5526,8 +5555,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5754,11 +5784,14 @@ def test_sample_query_set_service_base_transport(): def test_sample_query_set_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQuerySetServiceTransport( @@ -5775,9 +5808,12 @@ def test_sample_query_set_service_base_transport_with_credentials_file(): def test_sample_query_set_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.sample_query_set_service.transports.SampleQuerySetServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SampleQuerySetServiceTransport() @@ -5851,11 +5887,12 @@ def test_sample_query_set_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py index 11618c542aaf..5bd021bba7cf 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_schema_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,37 +44,37 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.schema_service import ( SchemaServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.schema_service import ( SchemaServiceClient, - pagers, - transports, ) +from google.cloud.discoveryengine_v1beta.services.schema_service import pagers +from google.cloud.discoveryengine_v1beta.services.schema_service import transports from google.cloud.discoveryengine_v1beta.types import schema from google.cloud.discoveryengine_v1beta.types import schema as gcd_schema from google.cloud.discoveryengine_v1beta.types import schema_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -835,10 +836,9 @@ def test_schema_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1093,13 +1093,13 @@ def test_schema_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4255,8 +4255,9 @@ def test_get_schema_rest_bad_request(request_type=schema_service.GetSchemaReques request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4322,17 +4323,19 @@ def test_get_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_get_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_get_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_get_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_get_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4383,8 +4386,9 @@ def test_list_schemas_rest_bad_request(request_type=schema_service.ListSchemasRe request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4447,17 +4451,19 @@ def test_list_schemas_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_list_schemas" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_list_schemas" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_list_schemas_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_list_schemas" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4512,8 +4518,9 @@ def test_create_schema_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4642,19 +4649,20 @@ def test_create_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_create_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_create_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_create_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_create_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_create_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4711,8 +4719,9 @@ def test_update_schema_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4845,19 +4854,20 @@ def test_update_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_update_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_update_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_update_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_update_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_update_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4912,8 +4922,9 @@ def test_delete_schema_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4972,19 +4983,20 @@ def test_delete_schema_rest_interceptors(null_interceptor): ) client = SchemaServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_delete_schema" - ) as post, mock.patch.object( - transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SchemaServiceRestInterceptor, "pre_delete_schema" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_delete_schema" + ) as post, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "post_delete_schema_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SchemaServiceRestInterceptor, "pre_delete_schema" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5042,8 +5054,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5109,8 +5122,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5176,8 +5190,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5416,11 +5431,14 @@ def test_schema_service_base_transport(): def test_schema_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport( @@ -5437,9 +5455,12 @@ def test_schema_service_base_transport_with_credentials_file(): def test_schema_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.schema_service.transports.SchemaServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SchemaServiceTransport() @@ -5511,11 +5532,12 @@ def test_schema_service_transport_auth_gdch_credentials(transport_class): def test_schema_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py index 2e1d10031933..7478c4390c5a 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,25 +44,31 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1beta.services.search_service import ( + SearchServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.search_service import ( + SearchServiceClient, +) +from google.cloud.discoveryengine_v1beta.services.search_service import pagers +from google.cloud.discoveryengine_v1beta.services.search_service import transports +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import search_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import struct_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1beta.services.search_service import ( - SearchServiceAsyncClient, - SearchServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1beta.types import common, search_service CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -823,10 +830,9 @@ def test_search_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1081,13 +1087,13 @@ def test_search_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1263,9 +1269,9 @@ async def test_search_async_use_cached_wrapped_rpc(transport: str = "grpc_asynci # Replace cached wrapped function with mock mock_rpc = mock.AsyncMock() mock_rpc.return_value = mock.Mock() - client._client._transport._wrapped_methods[ - client._client._transport.search - ] = mock_rpc + client._client._transport._wrapped_methods[client._client._transport.search] = ( + mock_rpc + ) request = {} await client.search(request) @@ -1580,7 +1586,9 @@ async def test_search_async_pages(): pages = [] # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 - async for page_ in (await client.search(request={})).pages: # pragma: no branch + async for page_ in ( # pragma: no branch + await client.search(request={}) + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -2679,8 +2687,9 @@ def test_search_rest_bad_request(request_type=search_service.SearchRequest): request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2755,17 +2764,17 @@ def test_search_rest_interceptors(null_interceptor): ) client = SearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search" - ) as post, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SearchServiceRestInterceptor, "pre_search" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search" + ) as post, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_with_metadata" + ) as post_with_metadata, + mock.patch.object(transports.SearchServiceRestInterceptor, "pre_search") as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2818,8 +2827,9 @@ def test_search_lite_rest_bad_request(request_type=search_service.SearchRequest) request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2894,17 +2904,19 @@ def test_search_lite_rest_interceptors(null_interceptor): ) client = SearchServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_lite" - ) as post, mock.patch.object( - transports.SearchServiceRestInterceptor, "post_search_lite_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SearchServiceRestInterceptor, "pre_search_lite" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_lite" + ) as post, + mock.patch.object( + transports.SearchServiceRestInterceptor, "post_search_lite_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SearchServiceRestInterceptor, "pre_search_lite" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2962,8 +2974,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3029,8 +3042,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3096,8 +3110,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3251,11 +3266,14 @@ def test_search_service_base_transport(): def test_search_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport( @@ -3272,9 +3290,12 @@ def test_search_service_base_transport_with_credentials_file(): def test_search_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.search_service.transports.SearchServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchServiceTransport() @@ -3346,11 +3367,12 @@ def test_search_service_transport_auth_gdch_credentials(transport_class): def test_search_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py index 8dc4448416bd..948f93ba3312 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_search_tuning_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,36 +44,36 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account - from google.cloud.discoveryengine_v1beta.services.search_tuning_service import ( SearchTuningServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.search_tuning_service import ( SearchTuningServiceClient, - transports, ) -from google.cloud.discoveryengine_v1beta.types import ( - custom_tuning_model, - import_config, - search_tuning_service, +from google.cloud.discoveryengine_v1beta.services.search_tuning_service import ( + transports, ) +from google.cloud.discoveryengine_v1beta.types import custom_tuning_model +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import search_tuning_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -885,10 +886,9 @@ def test_search_tuning_service_client_get_mtls_endpoint_and_cert_source(client_c "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1156,13 +1156,13 @@ def test_search_tuning_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1276,9 +1276,9 @@ def test_train_custom_model_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1536,9 +1536,9 @@ def test_list_custom_models_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -1721,9 +1721,9 @@ def test_train_custom_model_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.train_custom_model - ] = mock_rpc + client._transport._wrapped_methods[client._transport.train_custom_model] = ( + mock_rpc + ) request = {} client.train_custom_model(request) @@ -1847,9 +1847,9 @@ def test_list_custom_models_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_custom_models - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_custom_models] = ( + mock_rpc + ) request = {} client.list_custom_models(request) @@ -2190,8 +2190,9 @@ def test_train_custom_model_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2250,20 +2251,21 @@ def test_train_custom_model_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "post_train_custom_model" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_train_custom_model_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "post_train_custom_model" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_train_custom_model_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_train_custom_model" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2318,8 +2320,9 @@ def test_list_custom_models_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -2381,18 +2384,20 @@ def test_list_custom_models_rest_interceptors(null_interceptor): ) client = SearchTuningServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "post_list_custom_models" - ) as post, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, - "post_list_custom_models_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "post_list_custom_models" + ) as post, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, + "post_list_custom_models_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SearchTuningServiceRestInterceptor, "pre_list_custom_models" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -2455,8 +2460,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2522,8 +2528,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2589,8 +2596,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -2770,11 +2778,14 @@ def test_search_tuning_service_base_transport(): def test_search_tuning_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport( @@ -2791,9 +2802,12 @@ def test_search_tuning_service_base_transport_with_credentials_file(): def test_search_tuning_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.search_tuning_service.transports.SearchTuningServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SearchTuningServiceTransport() @@ -2865,11 +2879,12 @@ def test_search_tuning_service_transport_auth_gdch_credentials(transport_class): def test_search_tuning_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py index 8ec08771a52a..8de846fba059 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_serving_config_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,31 +44,39 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.serving_config_service import ( ServingConfigServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.serving_config_service import ( ServingConfigServiceClient, - pagers, +) +from google.cloud.discoveryengine_v1beta.services.serving_config_service import pagers +from google.cloud.discoveryengine_v1beta.services.serving_config_service import ( transports, ) +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import search_service +from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import ( serving_config as gcd_serving_config, ) -from google.cloud.discoveryengine_v1beta.types import common, search_service -from google.cloud.discoveryengine_v1beta.types import serving_config from google.cloud.discoveryengine_v1beta.types import serving_config_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -880,10 +889,9 @@ def test_serving_config_service_client_get_mtls_endpoint_and_cert_source(client_ "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1151,13 +1159,13 @@ def test_serving_config_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1293,9 +1301,9 @@ def test_update_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -1721,9 +1729,9 @@ def test_get_serving_config_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -2091,9 +2099,9 @@ def test_list_serving_configs_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) @@ -2568,9 +2576,9 @@ def test_update_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_serving_config] = ( + mock_rpc + ) request = {} client.update_serving_config(request) @@ -2762,9 +2770,9 @@ def test_get_serving_config_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_serving_config - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_serving_config] = ( + mock_rpc + ) request = {} client.get_serving_config(request) @@ -2946,9 +2954,9 @@ def test_list_serving_configs_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_serving_configs - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_serving_configs] = ( + mock_rpc + ) request = {} client.list_serving_configs(request) @@ -3516,8 +3524,9 @@ def test_update_serving_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3757,18 +3766,20 @@ def test_update_serving_config_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "post_update_serving_config" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_update_serving_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_update_serving_config" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_update_serving_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_update_serving_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3825,8 +3836,9 @@ def test_get_serving_config_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3917,18 +3929,20 @@ def test_get_serving_config_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "post_get_serving_config" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_get_serving_config_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_get_serving_config" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_get_serving_config" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_get_serving_config_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_get_serving_config" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3983,8 +3997,9 @@ def test_list_serving_configs_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4049,18 +4064,20 @@ def test_list_serving_configs_rest_interceptors(null_interceptor): ) client = ServingConfigServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "post_list_serving_configs" - ) as post, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, - "post_list_serving_configs_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.ServingConfigServiceRestInterceptor, "pre_list_serving_configs" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "post_list_serving_configs" + ) as post, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, + "post_list_serving_configs_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.ServingConfigServiceRestInterceptor, "pre_list_serving_configs" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4123,8 +4140,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4190,8 +4208,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4257,8 +4276,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4439,11 +4459,14 @@ def test_serving_config_service_base_transport(): def test_serving_config_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport( @@ -4460,9 +4483,12 @@ def test_serving_config_service_base_transport_with_credentials_file(): def test_serving_config_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.serving_config_service.transports.ServingConfigServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.ServingConfigServiceTransport() @@ -4534,11 +4560,12 @@ def test_serving_config_service_transport_auth_gdch_credentials(transport_class) def test_serving_config_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py index c3659c604a6b..1541afc33a57 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_session_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,32 +44,35 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1beta.services.session_service import ( + SessionServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.session_service import ( + SessionServiceClient, +) +from google.cloud.discoveryengine_v1beta.services.session_service import pagers +from google.cloud.discoveryengine_v1beta.services.session_service import transports +from google.cloud.discoveryengine_v1beta.types import answer +from google.cloud.discoveryengine_v1beta.types import conversational_search_service +from google.cloud.discoveryengine_v1beta.types import session +from google.cloud.discoveryengine_v1beta.types import session as gcd_session from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import struct_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1beta.services.session_service import ( - SessionServiceAsyncClient, - SessionServiceClient, - pagers, - transports, -) -from google.cloud.discoveryengine_v1beta.types import ( - answer, - conversational_search_service, -) -from google.cloud.discoveryengine_v1beta.types import session -from google.cloud.discoveryengine_v1beta.types import session as gcd_session CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -834,10 +838,9 @@ def test_session_service_client_get_mtls_endpoint_and_cert_source(client_class): "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1092,13 +1095,13 @@ def test_session_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -4365,8 +4368,9 @@ def test_create_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4612,17 +4616,20 @@ def test_create_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_create_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_create_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_create_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_create_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_create_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_create_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -4677,8 +4684,9 @@ def test_delete_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -4737,13 +4745,13 @@ def test_delete_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_delete_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_delete_session" + ) as pre, + ): pre.assert_not_called() pb_message = conversational_search_service.DeleteSessionRequest.pb( conversational_search_service.DeleteSessionRequest() @@ -4792,8 +4800,9 @@ def test_update_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5043,17 +5052,20 @@ def test_update_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_update_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_update_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_update_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_update_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, + "post_update_session_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_update_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5108,8 +5120,9 @@ def test_get_session_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5182,17 +5195,19 @@ def test_get_session_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_get_session" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_get_session" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_get_session_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_get_session" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5245,8 +5260,9 @@ def test_list_sessions_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -5311,17 +5327,19 @@ def test_list_sessions_rest_interceptors(null_interceptor): ) client = SessionServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_sessions" - ) as post, mock.patch.object( - transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" - ) as post_with_metadata, mock.patch.object( - transports.SessionServiceRestInterceptor, "pre_list_sessions" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions" + ) as post, + mock.patch.object( + transports.SessionServiceRestInterceptor, "post_list_sessions_with_metadata" + ) as post_with_metadata, + mock.patch.object( + transports.SessionServiceRestInterceptor, "pre_list_sessions" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -5384,8 +5402,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5451,8 +5470,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5518,8 +5538,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -5736,11 +5757,14 @@ def test_session_service_base_transport(): def test_session_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport( @@ -5757,9 +5781,12 @@ def test_session_service_base_transport_with_credentials_file(): def test_session_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.session_service.transports.SessionServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SessionServiceTransport() @@ -5831,11 +5858,12 @@ def test_session_service_transport_auth_gdch_credentials(transport_class): def test_session_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py index 33fc4b153b90..a4bebb3efc96 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_site_search_engine_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -43,38 +44,40 @@ except ImportError: # pragma: NO COVER HAS_GOOGLE_AUTH_AIO = False -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -from google.cloud.location import locations_pb2 -from google.longrunning import operations_pb2 # type: ignore -from google.oauth2 import service_account -from google.protobuf import empty_pb2 # type: ignore -from google.protobuf import timestamp_pb2 # type: ignore - from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( SiteSearchEngineServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( SiteSearchEngineServiceClient, +) +from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( pagers, - transports, ) -from google.cloud.discoveryengine_v1beta.types import ( - site_search_engine, - site_search_engine_service, +from google.cloud.discoveryengine_v1beta.services.site_search_engine_service import ( + transports, ) +from google.cloud.discoveryengine_v1beta.types import site_search_engine +from google.cloud.discoveryengine_v1beta.types import site_search_engine_service +from google.cloud.location import locations_pb2 +from google.longrunning import operations_pb2 # type: ignore +from google.oauth2 import service_account +from google.protobuf import empty_pb2 # type: ignore +from google.protobuf import timestamp_pb2 # type: ignore +import google.auth + CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -891,10 +894,9 @@ def test_site_search_engine_service_client_get_mtls_endpoint_and_cert_source( "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1162,13 +1164,13 @@ def test_site_search_engine_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1282,9 +1284,9 @@ def test_get_site_search_engine_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -1621,9 +1623,9 @@ def test_create_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -2586,9 +2588,9 @@ def test_update_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -2932,9 +2934,9 @@ def test_delete_target_site_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -3283,9 +3285,9 @@ def test_list_target_sites_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -6250,9 +6252,9 @@ def test_get_site_search_engine_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.get_site_search_engine - ] = mock_rpc + client._transport._wrapped_methods[client._transport.get_site_search_engine] = ( + mock_rpc + ) request = {} client.get_site_search_engine(request) @@ -6434,9 +6436,9 @@ def test_create_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.create_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.create_target_site] = ( + mock_rpc + ) request = {} client.create_target_site(request) @@ -6943,9 +6945,9 @@ def test_update_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.update_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.update_target_site] = ( + mock_rpc + ) request = {} client.update_target_site(request) @@ -7124,9 +7126,9 @@ def test_delete_target_site_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.delete_target_site - ] = mock_rpc + client._transport._wrapped_methods[client._transport.delete_target_site] = ( + mock_rpc + ) request = {} client.delete_target_site(request) @@ -7305,9 +7307,9 @@ def test_list_target_sites_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.list_target_sites - ] = mock_rpc + client._transport._wrapped_methods[client._transport.list_target_sites] = ( + mock_rpc + ) request = {} client.list_target_sites(request) @@ -9721,8 +9723,9 @@ def test_get_site_search_engine_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -9787,18 +9790,22 @@ def test_get_site_search_engine_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_get_site_search_engine" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_site_search_engine_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_site_search_engine" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_site_search_engine_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_get_site_search_engine", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -9858,8 +9865,9 @@ def test_create_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10002,20 +10010,21 @@ def test_create_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_create_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_create_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_create_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_create_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10070,8 +10079,9 @@ def test_batch_create_target_sites_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10130,22 +10140,23 @@ def test_batch_create_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_create_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_create_target_sites", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_create_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_create_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10200,8 +10211,9 @@ def test_get_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10280,18 +10292,20 @@ def test_get_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_get_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_get_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_get_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_get_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10350,8 +10364,9 @@ def test_update_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10496,20 +10511,21 @@ def test_update_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_update_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_update_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_update_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_update_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10564,8 +10580,9 @@ def test_delete_target_site_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10624,20 +10641,21 @@ def test_delete_target_site_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_delete_target_site_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_delete_target_site" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_delete_target_site_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_target_site" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10692,8 +10710,9 @@ def test_list_target_sites_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10762,18 +10781,20 @@ def test_list_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_list_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_list_target_sites" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_list_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_list_target_sites" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -10833,8 +10854,9 @@ def test_create_sitemap_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -10965,20 +10987,21 @@ def test_create_sitemap_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_create_sitemap" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_create_sitemap_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_create_sitemap" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_create_sitemap" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_create_sitemap_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_create_sitemap" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11033,8 +11056,9 @@ def test_delete_sitemap_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11093,20 +11117,21 @@ def test_delete_sitemap_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_delete_sitemap" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_delete_sitemap_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_sitemap" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_delete_sitemap" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_delete_sitemap_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_delete_sitemap" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11161,8 +11186,9 @@ def test_fetch_sitemaps_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11224,18 +11250,20 @@ def test_fetch_sitemaps_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_fetch_sitemaps" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_sitemaps_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_fetch_sitemaps" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_fetch_sitemaps" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_sitemaps_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_fetch_sitemaps" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11295,8 +11323,9 @@ def test_enable_advanced_site_search_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11355,22 +11384,23 @@ def test_enable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_enable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_enable_advanced_site_search", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_enable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_enable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11425,8 +11455,9 @@ def test_disable_advanced_site_search_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11485,22 +11516,23 @@ def test_disable_advanced_site_search_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_disable_advanced_site_search_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_disable_advanced_site_search", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_disable_advanced_site_search_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_disable_advanced_site_search", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11555,8 +11587,9 @@ def test_recrawl_uris_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11615,20 +11648,21 @@ def test_recrawl_uris_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_recrawl_uris_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "post_recrawl_uris" + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_recrawl_uris_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, "pre_recrawl_uris" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11683,8 +11717,9 @@ def test_batch_verify_target_sites_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11743,22 +11778,23 @@ def test_batch_verify_target_sites_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_batch_verify_target_sites_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_batch_verify_target_sites", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_batch_verify_target_sites_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_batch_verify_target_sites", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11813,8 +11849,9 @@ def test_fetch_domain_verification_status_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -11885,20 +11922,22 @@ def test_fetch_domain_verification_status_rest_interceptors(null_interceptor): ) client = SiteSearchEngineServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status", - ) as post, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "post_fetch_domain_verification_status_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.SiteSearchEngineServiceRestInterceptor, - "pre_fetch_domain_verification_status", - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status", + ) as post, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "post_fetch_domain_verification_status_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.SiteSearchEngineServiceRestInterceptor, + "pre_fetch_domain_verification_status", + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -11965,8 +12004,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12032,8 +12072,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12099,8 +12140,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -12569,11 +12611,14 @@ def test_site_search_engine_service_base_transport(): def test_site_search_engine_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport( @@ -12590,9 +12635,12 @@ def test_site_search_engine_service_base_transport_with_credentials_file(): def test_site_search_engine_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.site_search_engine_service.transports.SiteSearchEngineServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SiteSearchEngineServiceTransport() @@ -12666,11 +12714,12 @@ def test_site_search_engine_service_transport_create_channel( ): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"]) diff --git a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py index 98bc46398466..277ad7670cab 100644 --- a/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py +++ b/packages/google-cloud-discoveryengine/tests/unit/gapic/discoveryengine_v1beta/test_user_event_service.py @@ -22,19 +22,20 @@ except ImportError: # pragma: NO COVER import mock -from collections.abc import AsyncIterable, Iterable +import grpc +from grpc.experimental import aio +from collections.abc import Iterable, AsyncIterable +from google.protobuf import json_format import json import math - +import pytest from google.api_core import api_core_version -from google.protobuf import json_format -import grpc -from grpc.experimental import aio -from proto.marshal.rules import wrappers from proto.marshal.rules.dates import DurationRule, TimestampRule -import pytest -from requests import PreparedRequest, Request, Response +from proto.marshal.rules import wrappers +from requests import Response +from requests import Request, PreparedRequest from requests.sessions import Session +from google.protobuf import json_format try: from google.auth.aio import credentials as ga_credentials_async @@ -44,22 +45,31 @@ HAS_GOOGLE_AUTH_AIO = False from google.api import httpbody_pb2 # type: ignore -from google.api_core import ( - future, - gapic_v1, - grpc_helpers, - grpc_helpers_async, - operation, - operations_v1, - path_template, -) from google.api_core import client_options from google.api_core import exceptions as core_exceptions +from google.api_core import future +from google.api_core import gapic_v1 +from google.api_core import grpc_helpers +from google.api_core import grpc_helpers_async +from google.api_core import operation from google.api_core import operation_async # type: ignore +from google.api_core import operations_v1 +from google.api_core import path_template from google.api_core import retry as retries -import google.auth from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError +from google.cloud.discoveryengine_v1beta.services.user_event_service import ( + UserEventServiceAsyncClient, +) +from google.cloud.discoveryengine_v1beta.services.user_event_service import ( + UserEventServiceClient, +) +from google.cloud.discoveryengine_v1beta.services.user_event_service import transports +from google.cloud.discoveryengine_v1beta.types import common +from google.cloud.discoveryengine_v1beta.types import import_config +from google.cloud.discoveryengine_v1beta.types import purge_config +from google.cloud.discoveryengine_v1beta.types import user_event +from google.cloud.discoveryengine_v1beta.types import user_event_service from google.cloud.location import locations_pb2 from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account @@ -67,19 +77,8 @@ from google.protobuf import duration_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.type import date_pb2 # type: ignore +import google.auth -from google.cloud.discoveryengine_v1beta.services.user_event_service import ( - UserEventServiceAsyncClient, - UserEventServiceClient, - transports, -) -from google.cloud.discoveryengine_v1beta.types import ( - common, - import_config, - purge_config, - user_event, - user_event_service, -) CRED_INFO_JSON = { "credential_source": "/path/to/file", @@ -870,10 +869,9 @@ def test_user_event_service_client_get_mtls_endpoint_and_cert_source(client_clas "google.auth.transport.mtls.default_client_cert_source", return_value=mock_client_cert_source, ): - ( - api_endpoint, - cert_source, - ) = client_class.get_mtls_endpoint_and_cert_source() + api_endpoint, cert_source = ( + client_class.get_mtls_endpoint_and_cert_source() + ) assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT assert cert_source == mock_client_cert_source @@ -1133,13 +1131,13 @@ def test_user_event_service_client_create_channel_credentials_file( ) # test that the credentials from file are saved and used as the credentials. - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel" - ) as create_channel: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object(grpc_helpers, "create_channel") as create_channel, + ): creds = ga_credentials.AnonymousCredentials() file_creds = ga_credentials.AnonymousCredentials() load_creds.return_value = (file_creds, None) @@ -1264,9 +1262,9 @@ def test_write_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -1538,9 +1536,9 @@ def test_collect_user_event_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -1793,9 +1791,9 @@ def test_purge_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2052,9 +2050,9 @@ def test_import_user_events_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -2244,9 +2242,9 @@ def test_write_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.write_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.write_user_event] = ( + mock_rpc + ) request = {} client.write_user_event(request) @@ -2379,9 +2377,9 @@ def test_collect_user_event_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.collect_user_event - ] = mock_rpc + client._transport._wrapped_methods[client._transport.collect_user_event] = ( + mock_rpc + ) request = {} client.collect_user_event(request) @@ -2534,9 +2532,9 @@ def test_purge_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.purge_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.purge_user_events] = ( + mock_rpc + ) request = {} client.purge_user_events(request) @@ -2672,9 +2670,9 @@ def test_import_user_events_rest_use_cached_wrapped_rpc(): mock_rpc.return_value.name = ( "foo" # operation_request.operation in compute client(s) expect a string. ) - client._transport._wrapped_methods[ - client._transport.import_user_events - ] = mock_rpc + client._transport._wrapped_methods[client._transport.import_user_events] = ( + mock_rpc + ) request = {} client.import_user_events(request) @@ -3123,8 +3121,9 @@ def test_write_user_event_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3332,18 +3331,20 @@ def test_write_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_write_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_write_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_write_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_write_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_write_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_write_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3396,8 +3397,9 @@ def test_collect_user_event_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3459,18 +3461,20 @@ def test_collect_user_event_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_collect_user_event" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_collect_user_event_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_collect_user_event" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_collect_user_event" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_collect_user_event_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_collect_user_event" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3523,8 +3527,9 @@ def test_purge_user_events_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3581,20 +3586,21 @@ def test_purge_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_purge_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_purge_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_purge_user_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_purge_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_purge_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_purge_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3647,8 +3653,9 @@ def test_import_user_events_rest_bad_request( request = request_type(**request_init) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = mock.Mock() @@ -3705,20 +3712,21 @@ def test_import_user_events_rest_interceptors(null_interceptor): ) client = UserEventServiceClient(transport=transport) - with mock.patch.object( - type(client.transport._session), "request" - ) as req, mock.patch.object( - path_template, "transcode" - ) as transcode, mock.patch.object( - operation.Operation, "_set_result_from_operation" - ), mock.patch.object( - transports.UserEventServiceRestInterceptor, "post_import_user_events" - ) as post, mock.patch.object( - transports.UserEventServiceRestInterceptor, - "post_import_user_events_with_metadata", - ) as post_with_metadata, mock.patch.object( - transports.UserEventServiceRestInterceptor, "pre_import_user_events" - ) as pre: + with ( + mock.patch.object(type(client.transport._session), "request") as req, + mock.patch.object(path_template, "transcode") as transcode, + mock.patch.object(operation.Operation, "_set_result_from_operation"), + mock.patch.object( + transports.UserEventServiceRestInterceptor, "post_import_user_events" + ) as post, + mock.patch.object( + transports.UserEventServiceRestInterceptor, + "post_import_user_events_with_metadata", + ) as post_with_metadata, + mock.patch.object( + transports.UserEventServiceRestInterceptor, "pre_import_user_events" + ) as pre, + ): pre.assert_not_called() post.assert_not_called() post_with_metadata.assert_not_called() @@ -3776,8 +3784,9 @@ def test_cancel_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3843,8 +3852,9 @@ def test_get_operation_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -3910,8 +3920,9 @@ def test_list_operations_rest_bad_request( ) # Mock the http request call within the method and fake a BadRequest error. - with mock.patch.object(Session, "request") as req, pytest.raises( - core_exceptions.BadRequest + with ( + mock.patch.object(Session, "request") as req, + pytest.raises(core_exceptions.BadRequest), ): # Wrap the value into a proper Response obj response_value = Response() @@ -4135,11 +4146,14 @@ def test_user_event_service_base_transport(): def test_user_event_service_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.discoveryengine_v1beta.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object( + google.auth, "load_credentials_from_file", autospec=True + ) as load_creds, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport( @@ -4156,9 +4170,12 @@ def test_user_event_service_base_transport_with_credentials_file(): def test_user_event_service_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. - with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( - "google.cloud.discoveryengine_v1beta.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" - ) as Transport: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch( + "google.cloud.discoveryengine_v1beta.services.user_event_service.transports.UserEventServiceTransport._prep_wrapped_messages" + ) as Transport, + ): Transport.return_value = None adc.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.UserEventServiceTransport() @@ -4230,11 +4247,12 @@ def test_user_event_service_transport_auth_gdch_credentials(transport_class): def test_user_event_service_transport_create_channel(transport_class, grpc_helpers): # If credentials and host are not provided, the transport class should use # ADC credentials. - with mock.patch.object( - google.auth, "default", autospec=True - ) as adc, mock.patch.object( - grpc_helpers, "create_channel", autospec=True - ) as create_channel: + with ( + mock.patch.object(google.auth, "default", autospec=True) as adc, + mock.patch.object( + grpc_helpers, "create_channel", autospec=True + ) as create_channel, + ): creds = ga_credentials.AnonymousCredentials() adc.return_value = (creds, None) transport_class(quota_project_id="octopus", scopes=["1", "2"])